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.99 by root, Mon Apr 16 06:23:39 2007 UTC vs.
Revision 1.165 by root, Tue Oct 20 05:57:08 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/* 31sint8 maptile::outdoor_darkness;
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
48/*
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 32
100/* This rolls up wall, blocks_magic, blocks_view, etc, all into 33/* This rolls up wall, blocks_magic, blocks_view, etc, all into
101 * one function that just returns a P_.. value (see map.h) 34 * one function that just returns a P_.. value (see map.h)
102 * it will also do map translation for tiled maps, returning 35 * it will also do map translation for tiled maps, returning
103 * new values into newmap, nx, and ny. Any and all of those 36 * new values into newmap, nx, and ny. Any and all of those
… …
138 * by the caller. 71 * by the caller.
139 */ 72 */
140int 73int
141blocked_link (object *ob, maptile *m, int sx, int sy) 74blocked_link (object *ob, maptile *m, int sx, int sy)
142{ 75{
143 object *tmp;
144 int mflags, blocked;
145
146 /* Make sure the coordinates are valid - they should be, as caller should 76 /* Make sure the coordinates are valid - they should be, as caller should
147 * have already checked this. 77 * have already checked this.
148 */ 78 */
149 if (OUT_OF_REAL_MAP (m, sx, sy)) 79 if (OUT_OF_REAL_MAP (m, sx, sy))
150 { 80 {
… …
153 } 83 }
154 84
155 /* Save some cycles - instead of calling get_map_flags(), just get the value 85 /* Save some cycles - instead of calling get_map_flags(), just get the value
156 * directly. 86 * directly.
157 */ 87 */
158 mflags = m->at (sx, sy).flags (); 88 mapspace &ms = m->at (sx, sy);
159 89
160 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 90 int mflags = ms.flags ();
91 int blocked = ms.move_block;
161 92
162 /* If space is currently not blocked by anything, no need to 93 /* If space is currently not blocked by anything, no need to
163 * go further. Not true for players - all sorts of special 94 * go further. Not true for players - all sorts of special
164 * things we need to do for players. 95 * things we need to do for players.
165 */ 96 */
166 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 97 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
167 return 0; 98 return 0;
168 99
169 /* if there isn't anytyhing alive on this space, and this space isn't 100 /* if there isn't anything alive on this space, and this space isn't
170 * otherwise blocked, we can return now. Only if there is a living 101 * otherwise blocked, we can return now. Only if there is a living
171 * creature do we need to investigate if it is part of this creature 102 * creature do we need to investigate if it is part of this creature
172 * or another. Likewise, only if something is blocking us do we 103 * or another. Likewise, only if something is blocking us do we
173 * need to investigate if there is a special circumstance that would 104 * need to investigate if there is a special circumstance that would
174 * let the player through (inventory checkers for example) 105 * let the player through (inventory checkers for example)
175 */ 106 */
176 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked)) 107 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))
177 return 0; 108 return 0;
178 109
179 if (ob->head != NULL)
180 ob = ob->head; 110 ob = ob->head_ ();
181 111
182 /* We basically go through the stack of objects, and if there is 112 /* We basically go through the stack of objects, and if there is
183 * some other object that has NO_PASS or FLAG_ALIVE set, return 113 * some other object that has NO_PASS or FLAG_ALIVE set, return
184 * true. If we get through the entire stack, that must mean 114 * true. If we get through the entire stack, that must mean
185 * ob is blocking it, so return 0. 115 * ob is blocking it, so return 0.
186 */ 116 */
187 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 117 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
188 { 118 {
189 119 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 { 120 {
193 /* If last_sp is set, the player/monster needs an object, 121 if (tmp->type == CHECK_INV)
194 * so we check for it. If they don't have it, they can't
195 * pass through this space.
196 */
197 if (tmp->last_sp)
198 { 122 {
199 if (check_inv_recursive (ob, tmp) == NULL) 123 bool have = check_inv_recursive (ob, tmp);
124
125 // last_sp set means we block if we don't have.
126 if (logical_xor (have, tmp->last_sp))
200 return 1; 127 return 1;
201 else 128 }
202 continue; 129 else if (tmp->type == T_MATCH)
130 {
131 // T_MATCH allows "entrance" iff the match is true
132 // == blocks if the match fails
133
134 // we could have used an INVOKE_OBJECT, but decided against it, as we
135 // assume that T_MATCH is very common.
136 if (!match (tmp->slaying, ob, tmp, ob))
137 return 1;
203 } 138 }
204 else 139 else
205 { 140 return 1; // unconditional block
206 /* In this case, the player must not have the object - 141
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 142 } else {
216 { 143 // space does not block the ob, directly, but
217 /* Broke apart a big nasty if into several here to make 144 // anything alive that is not a door still
218 * this more readable. first check - if the space blocks 145 // blocks anything but wizards.
219 * movement, can't move here. 146
220 * second - if a monster, can't move there, unles it is a 147 if (tmp->flag [FLAG_ALIVE]
221 * hidden dm 148 && tmp->head_ () != ob
222 */ 149 && tmp != ob
223 if (OB_MOVE_BLOCK (ob, tmp)) 150 && tmp->type != DOOR
224 return 1; 151 && !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; 152 return 1;
228 } 153 }
229
230 } 154 }
155
231 return 0; 156 return 0;
232} 157}
233 158
234/* 159/*
235 * Returns true if the given object can't fit in the given spot. 160 * 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, 161 * spot. This is meant for multi space objects - for single space objecs,
237 * just calling get_map_blocked and checking that against movement type 162 * just calling get_map_blocked and checking that against movement type
238 * of object. This function goes through all the parts of the 163 * of object. This function goes through all the parts of the multipart
239 * multipart object and makes sure they can be inserted. 164 * object and makes sure they can be inserted.
240 * 165 *
241 * While this doesn't call out of map, the get_map_flags does. 166 * While this doesn't call out of map, the get_map_flags does.
242 * 167 *
243 * This function has been used to deprecate arch_out_of_map - 168 * This function has been used to deprecate arch_out_of_map -
244 * this function also does that check, and since in most cases, 169 * this function also does that check, and since in most cases,
… …
255 * 180 *
256 * Note this used to be arch_blocked, but with new movement 181 * Note this used to be arch_blocked, but with new movement
257 * code, we need to have actual object to check its move_type 182 * code, we need to have actual object to check its move_type
258 * against the move_block values. 183 * against the move_block values.
259 */ 184 */
260int 185bool
261ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 186object::blocked (maptile *m, int x, int y) const
262{ 187{
263 archetype *tmp; 188 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 } 189 {
190 mapxy pos (m, x + tmp->x, y + tmp->y);
277 191
278 for (tmp = ob->arch; tmp; tmp = tmp->more) 192 if (!pos.normalise ())
279 { 193 return 1;
280 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
281 194
282 if (flag & P_OUT_OF_MAP) 195 mapspace &ms = *pos;
283 return P_OUT_OF_MAP; 196
284 if (flag & P_IS_ALIVE) 197 if (ms.flags () & P_IS_ALIVE)
285 return P_IS_ALIVE; 198 return 1;
286 199
287 mapspace &ms = m1->at (sx, sy); 200 /* However, often ob doesn't have any move type
288 201 * (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. 202 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
292 */ 203 */
293
294 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 204 if (!move_type && ms.move_block != MOVE_ALL)
295 continue; 205 continue;
296 206
297 /* Note it is intentional that we check ob - the movement type of the 207 /* Note it is intentional that we check ob - the movement type of the
298 * head of the object should correspond for the entire object. 208 * head of the object should correspond for the entire object.
299 */ 209 */
300 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 210 if (ms.blocks (move_type))
301 return P_NO_PASS; 211 return 1;
302 } 212 }
303 213
304 return 0; 214 return 0;
305} 215}
306 216
… …
324 234
325 insert_ob_in_ob (tmp, container); 235 insert_ob_in_ob (tmp, container);
326 tmp = next; 236 tmp = next;
327 } 237 }
328 238
329 /* sum_weight will go through and calculate what all the containers are 239 // go through and calculate what all the containers are carrying.
330 * carrying. 240 //TODO: remove
331 */ 241 container->update_weight ();
332 sum_weight (container);
333} 242}
334 243
335void 244void
336maptile::set_object_flag (int flag, int value) 245maptile::set_object_flag (int flag, int value)
337{ 246{
… …
339 return; 248 return;
340 249
341 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 250 for (mapspace *ms = spaces + size (); ms-- > spaces; )
342 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 251 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
343 tmp->flag [flag] = value; 252 tmp->flag [flag] = value;
253}
254
255void
256maptile::post_load_original ()
257{
258 if (!spaces)
259 return;
260
261 set_object_flag (FLAG_OBJ_ORIGINAL);
262
263 for (mapspace *ms = spaces + size (); ms-- > spaces; )
264 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
265 INVOKE_OBJECT (RESET, tmp);
344} 266}
345 267
346/* link_multipart_objects go through all the objects on the map looking 268/* 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 269 * 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 270 * info we have, they only have the head (as would be expected when
… …
353{ 275{
354 if (!spaces) 276 if (!spaces)
355 return; 277 return;
356 278
357 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 279 for (mapspace *ms = spaces + size (); ms-- > spaces; )
358 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 280 {
281 object *op = ms->bot;
282 while (op)
359 { 283 {
360 /* already multipart - don't do anything more */ 284 /* already multipart - don't do anything more */
361 if (!tmp->head && !tmp->more) 285 if (op->head_ () == op && !op->more && op->arch->more)
362 {
363 /* If there is nothing more to this object, this for loop
364 * won't do anything.
365 */
366 archetype *at;
367 object *last, *op;
368 for (at = tmp->arch->more, last = tmp;
369 at;
370 at = at->more, last = op)
371 { 286 {
372 op = arch_to_object (at); 287 op->remove ();
288 op->expand_tail ();
373 289
374 /* update x,y coordinates */ 290 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
375 op->x += tmp->x; 291 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
376 op->y += tmp->y; 292 // below the pentagrams... hopefully INS_ON_TOP doesn't break anything
377 op->head = tmp;
378 op->map = this;
379 last->more = op;
380 op->name = tmp->name;
381 op->title = tmp->title;
382
383 /* we could link all the parts onto tmp, and then just
384 * call insert_ob_in_map once, but the effect is the same,
385 * as insert_ob_in_map will call itself with each part, and
386 * the coding is simpler to just to it here with each part.
387 */
388 insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 293 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
294
295 op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
296 // so we have to reset the iteration through the mapspace
389 } 297 }
298 else
299 op = op->above;
390 } 300 }
391 } 301 }
392} 302}
393 303
394/* 304/*
395 * Loads (ands parses) the objects into a given map from the specified 305 * Loads (ands parses) the objects into a given map from the specified
396 * file pointer. 306 * file pointer.
… …
398bool 308bool
399maptile::_load_objects (object_thawer &f) 309maptile::_load_objects (object_thawer &f)
400{ 310{
401 for (;;) 311 for (;;)
402 { 312 {
403 coroapi::cede_every (1000); // cede once in a while 313 coroapi::cede_to_tick (); // cede once in a while
404 314
405 switch (f.kw) 315 switch (f.kw)
406 { 316 {
407 case KW_arch: 317 case KW_arch:
408 if (object *op = object::read (f, this)) 318 if (object *op = object::read (f, this))
409 { 319 {
320 // TODO: why?
410 if (op->inv) 321 if (op->inv)
411 sum_weight (op); 322 op->update_weight ();
412 323
413 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 324 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
325 {
326 // we insert manually because
327 // a) its way faster
328 // b) we remove manually, too, and there are good reasons for that
329 // c) it's correct
330 mapspace &ms = at (op->x, op->y);
331
332 op->flag [FLAG_REMOVED] = false;
333
334 op->above = 0;
335 op->below = ms.top;
336
337 *(ms.top ? &ms.top->above : &ms.bot) = op;
338
339 ms.top = op;
340 ms.flags_ = 0;
341 }
342 else
343 {
344 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
345 op->destroy ();
346 }
414 } 347 }
415 348
416 continue; 349 continue;
417 350
418 case KW_EOF: 351 case KW_EOF:
… …
431} 364}
432 365
433void 366void
434maptile::activate () 367maptile::activate ()
435{ 368{
436 if (!spaces) 369 if (spaces)
437 return;
438
439 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 370 for (mapspace *ms = spaces + size (); ms-- > spaces; )
440 for (object *op = ms->bot; op; op = op->above) 371 for (object *op = ms->bot; op; op = op->above)
441 op->activate_recursive (); 372 op->activate_recursive ();
442} 373}
443 374
444void 375void
445maptile::deactivate () 376maptile::deactivate ()
446{ 377{
447 if (!spaces) 378 if (spaces)
448 return;
449
450 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 379 for (mapspace *ms = spaces + size (); ms-- > spaces; )
451 for (object *op = ms->bot; op; op = op->above) 380 for (object *op = ms->bot; op; op = op->above)
452 op->deactivate_recursive (); 381 op->deactivate_recursive ();
453} 382}
454 383
455bool 384bool
456maptile::_save_objects (object_freezer &f, int flags) 385maptile::_save_objects (object_freezer &f, int flags)
457{ 386{
458 coroapi::cede (); 387 coroapi::cede_to_tick ();
459 388
460 if (flags & IO_HEADER) 389 if (flags & IO_HEADER)
461 _save_header (f); 390 _save_header (f);
462 391
463 if (!spaces) 392 if (!spaces)
464 return false; 393 return false;
465 394
466 for (int i = 0; i < size (); ++i) 395 for (int i = 0; i < size (); ++i)
467 { 396 {
468 int unique = 0; 397 bool unique = 0;
398
469 for (object *op = spaces [i].bot; op; op = op->above) 399 for (object *op = spaces [i].bot; op; op = op->above)
470 { 400 {
471 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 401 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
472 unique = 1;
473 402
474 if (!op->can_map_save ()) 403 if (expect_false (!op->can_map_save ()))
475 continue; 404 continue;
476 405
477 if (unique || op->flag [FLAG_UNIQUE]) 406 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
478 { 407 {
479 if (flags & IO_UNIQUES) 408 if (flags & IO_UNIQUES)
480 op->write (f); 409 op->write (f);
481 } 410 }
482 else if (flags & IO_OBJECTS) 411 else if (expect_true (flags & IO_OBJECTS))
483 op->write (f); 412 op->write (f);
484 } 413 }
485 } 414 }
486 415
487 coroapi::cede (); 416 coroapi::cede_to_tick ();
488 417
489 return true; 418 return true;
490}
491
492bool
493maptile::_load_objects (const char *path, bool skip_header)
494{
495 object_thawer f (path);
496
497 if (!f)
498 return false;
499
500 f.next ();
501
502 if (skip_header)
503 for (;;)
504 {
505 keyword kw = f.kw;
506 f.skip ();
507 if (kw == KW_end)
508 break;
509 }
510
511 return _load_objects (f);
512} 419}
513 420
514bool 421bool
515maptile::_save_objects (const char *path, int flags) 422maptile::_save_objects (const char *path, int flags)
516{ 423{
… …
647 return items; 554 return items;
648} 555}
649 556
650/* opposite of parse string, this puts the string that was originally fed in to 557/* opposite of parse string, this puts the string that was originally fed in to
651 * the map (or something equivilent) into output_string. */ 558 * the map (or something equivilent) into output_string. */
652static void 559static const char *
653print_shop_string (maptile *m, char *output_string) 560print_shop_string (maptile *m)
654{ 561{
655 int i; 562 static dynbuf_text buf; buf.clear ();
656 char tmp[MAX_BUF];
657 563
658 strcpy (output_string, "");
659 for (i = 0; i < m->shopitems[0].index; i++) 564 for (int i = 0; i < m->shopitems[0].index; i++)
660 { 565 {
661 if (m->shopitems[i].typenum) 566 if (m->shopitems[i].typenum)
662 { 567 {
663 if (m->shopitems[i].strength) 568 if (m->shopitems[i].strength)
664 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 569 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
665 else 570 else
666 sprintf (tmp, "%s;", m->shopitems[i].name); 571 buf.printf ("%s;", m->shopitems[i].name);
667 } 572 }
668 else 573 else
669 { 574 {
670 if (m->shopitems[i].strength) 575 if (m->shopitems[i].strength)
671 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 576 buf.printf ("*:%d;", m->shopitems[i].strength);
672 else 577 else
673 sprintf (tmp, "*"); 578 buf.printf ("*");
674 } 579 }
675
676 strcat (output_string, tmp);
677 } 580 }
581
582 return buf;
678} 583}
679 584
680/* This loads the header information of the map. The header 585/* This loads the header information of the map. The header
681 * contains things like difficulty, size, timeout, etc. 586 * contains things like difficulty, size, timeout, etc.
682 * this used to be stored in the map object, but with the 587 * this used to be stored in the map object, but with the
… …
691bool 596bool
692maptile::_load_header (object_thawer &thawer) 597maptile::_load_header (object_thawer &thawer)
693{ 598{
694 for (;;) 599 for (;;)
695 { 600 {
696 keyword kw = thawer.get_kv ();
697
698 switch (kw) 601 switch (thawer.kw)
699 { 602 {
700 case KW_msg: 603 case KW_msg:
701 thawer.get_ml (KW_endmsg, msg); 604 thawer.get_ml (KW_endmsg, msg);
702 break; 605 break;
703 606
… …
735 case KW_winddir: thawer.get (winddir); break; 638 case KW_winddir: thawer.get (winddir); break;
736 case KW_sky: thawer.get (sky); break; 639 case KW_sky: thawer.get (sky); break;
737 640
738 case KW_per_player: thawer.get (per_player); break; 641 case KW_per_player: thawer.get (per_player); break;
739 case KW_per_party: thawer.get (per_party); break; 642 case KW_per_party: thawer.get (per_party); break;
643 case KW_no_reset: thawer.get (no_reset); break;
644 case KW_no_drop: thawer.get (no_drop); break;
740 645
741 case KW_region: default_region = region::find (thawer.get_str ()); break; 646 case KW_region: default_region = region::find (thawer.get_str ()); break;
742 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 647 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
743 648
744 // old names new names 649 // old names new names
… …
755 case KW_tile_path_1: thawer.get (tile_path [0]); break; 660 case KW_tile_path_1: thawer.get (tile_path [0]); break;
756 case KW_tile_path_2: thawer.get (tile_path [1]); break; 661 case KW_tile_path_2: thawer.get (tile_path [1]); break;
757 case KW_tile_path_3: thawer.get (tile_path [2]); break; 662 case KW_tile_path_3: thawer.get (tile_path [2]); break;
758 case KW_tile_path_4: thawer.get (tile_path [3]); break; 663 case KW_tile_path_4: thawer.get (tile_path [3]); break;
759 664
665 case KW_ERROR:
666 set_key_text (thawer.kw_str, thawer.value);
667 break;
668
760 case KW_end: 669 case KW_end:
670 thawer.next ();
761 return true; 671 return true;
762 672
763 default: 673 default:
764 if (!thawer.parse_error ("map", 0)) 674 if (!thawer.parse_error ("map", 0))
765 return false; 675 return false;
766 break; 676 break;
767 } 677 }
678
679 thawer.next ();
768 } 680 }
769 681
770 abort (); 682 abort ();
771}
772
773bool
774maptile::_load_header (const char *path)
775{
776 object_thawer thawer (path);
777
778 if (!thawer)
779 return false;
780
781 return _load_header (thawer);
782} 683}
783 684
784/****************************************************************************** 685/******************************************************************************
785 * This is the start of unique map handling code 686 * This is the start of unique map handling code
786 *****************************************************************************/ 687 *****************************************************************************/
… …
797 object *above = op->above; 698 object *above = op->above;
798 699
799 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 700 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
800 unique = 1; 701 unique = 1;
801 702
802 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 703 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
803 {
804 op->destroy_inv (false);
805 op->destroy (); 704 op->destroy ();
806 }
807 705
808 op = above; 706 op = above;
809 } 707 }
810 } 708 }
811} 709}
… …
821 if (name) MAP_OUT (name); 719 if (name) MAP_OUT (name);
822 MAP_OUT (swap_time); 720 MAP_OUT (swap_time);
823 MAP_OUT (reset_time); 721 MAP_OUT (reset_time);
824 MAP_OUT (reset_timeout); 722 MAP_OUT (reset_timeout);
825 MAP_OUT (fixed_resettime); 723 MAP_OUT (fixed_resettime);
724 MAP_OUT (no_reset);
725 MAP_OUT (no_drop);
826 MAP_OUT (difficulty); 726 MAP_OUT (difficulty);
827
828 if (default_region) MAP_OUT2 (region, default_region->name); 727 if (default_region) MAP_OUT2 (region, default_region->name);
829 728
830 if (shopitems) 729 if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
831 {
832 char shop[MAX_BUF];
833 print_shop_string (this, shop);
834 MAP_OUT2 (shopitems, shop);
835 }
836
837 MAP_OUT (shopgreed); 730 MAP_OUT (shopgreed);
838 MAP_OUT (shopmin); 731 MAP_OUT (shopmin);
839 MAP_OUT (shopmax); 732 MAP_OUT (shopmax);
840 if (shoprace) MAP_OUT (shoprace); 733 if (shoprace) MAP_OUT (shoprace);
734
841 MAP_OUT (darkness); 735 MAP_OUT (darkness);
842 MAP_OUT (width); 736 MAP_OUT (width);
843 MAP_OUT (height); 737 MAP_OUT (height);
844 MAP_OUT (enter_x); 738 MAP_OUT (enter_x);
845 MAP_OUT (enter_y); 739 MAP_OUT (enter_y);
… …
884 * Remove and free all objects in the given map. 778 * Remove and free all objects in the given map.
885 */ 779 */
886void 780void
887maptile::clear () 781maptile::clear ()
888{ 782{
889 sfree (regions, size ()), regions = 0;
890 free (regionmap), regionmap = 0;
891
892 if (spaces) 783 if (spaces)
893 { 784 {
894 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 785 for (mapspace *ms = spaces + size (); ms-- > spaces; )
895 while (object *op = ms->bot) 786 while (object *op = ms->bot)
896 { 787 {
788 // manually remove, as to not trigger anything
789 if (ms->bot = op->above)
790 ms->bot->below = 0;
791
792 op->flag [FLAG_REMOVED] = true;
793
794 object *head = op->head_ ();
897 if (op->head) 795 if (op == head)
898 op = op->head;
899
900 op->destroy_inv (false);
901 op->destroy (); 796 op->destroy ();
797 else if (head->map != op->map)
798 {
799 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
800 head->destroy ();
801 }
902 } 802 }
903 803
904 sfree (spaces, size ()), spaces = 0; 804 sfree0 (spaces, size ());
905 } 805 }
906 806
907 if (buttons) 807 if (buttons)
908 free_objectlinkpt (buttons), buttons = 0; 808 free_objectlinkpt (buttons), buttons = 0;
809
810 sfree0 (regions, size ());
811 delete [] regionmap; regionmap = 0;
909} 812}
910 813
911void 814void
912maptile::clear_header () 815maptile::clear_header ()
913{ 816{
… …
945 attachable::do_destroy (); 848 attachable::do_destroy ();
946 849
947 clear (); 850 clear ();
948} 851}
949 852
950/* 853/* decay and destroy perishable items in a map */
951 * Updates every button on the map (by calling update_button() for them).
952 */
953void 854void
954maptile::update_buttons () 855maptile::do_decay_objects ()
955{ 856{
956 for (oblinkpt *obp = buttons; obp; obp = obp->next) 857 if (!spaces)
957 for (objectlink *ol = obp->link; ol; ol = ol->next) 858 return;
859
860 for (mapspace *ms = spaces + size (); ms-- > spaces; )
861 for (object *above, *op = ms->bot; op; op = above)
958 { 862 {
959 if (!ol->ob) 863 above = op->above;
864
865 bool destroy = 0;
866
867 // do not decay anything above unique floor tiles (yet :)
868 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
869 break;
870
871 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
872 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
873 || QUERY_FLAG (op, FLAG_UNIQUE)
874 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
875 || QUERY_FLAG (op, FLAG_UNPAID)
876 || op->is_alive ())
877 ; // do not decay
878 else if (op->is_weapon ())
960 { 879 {
961 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n", 880 op->stats.dam--;
962 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value); 881 if (op->stats.dam < 0)
963 continue; 882 destroy = 1;
964 } 883 }
965 884 else if (op->is_armor ())
966 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
967 { 885 {
968 update_button (ol->ob); 886 op->stats.ac--;
969 break; 887 if (op->stats.ac < 0)
888 destroy = 1;
970 } 889 }
890 else if (op->type == FOOD)
891 {
892 op->stats.food -= rndm (5, 20);
893 if (op->stats.food < 0)
894 destroy = 1;
895 }
896 else
897 {
898 int mat = op->materials;
899
900 if (mat & M_PAPER
901 || mat & M_LEATHER
902 || mat & M_WOOD
903 || mat & M_ORGANIC
904 || mat & M_CLOTH
905 || mat & M_LIQUID
906 || (mat & M_IRON && rndm (1, 5) == 1)
907 || (mat & M_GLASS && rndm (1, 2) == 1)
908 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
909 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
910 || (mat & M_ICE && temp > 32))
911 destroy = 1;
912 }
913
914 /* adjust overall chance below */
915 if (destroy && rndm (0, 1))
916 op->destroy ();
971 } 917 }
972} 918}
973 919
974/* 920/*
975 * This routine is supposed to find out the difficulty of the map. 921 * This routine is supposed to find out the difficulty of the map.
976 * difficulty does not have a lot to do with character level, 922 * difficulty does not have a lot to do with character level,
977 * but does have a lot to do with treasure on the map. 923 * but does have a lot to do with treasure on the map.
978 * 924 *
979 * Difficulty can now be set by the map creature. If the value stored 925 * Difficulty can now be set by the map creator. If the value stored
980 * in the map is zero, then use this routine. Maps should really 926 * in the map is zero, then use this routine. Maps should really
981 * have a difficulty set than using this function - human calculation 927 * have a difficulty set rather than using this function - human calculation
982 * is much better than this functions guesswork. 928 * is much better than this function's guesswork.
983 */ 929 */
984int 930int
985maptile::estimate_difficulty () const 931maptile::estimate_difficulty () const
986{ 932{
987 long monster_cnt = 0; 933 long monster_cnt = 0;
… …
999 945
1000 if (QUERY_FLAG (op, FLAG_GENERATOR)) 946 if (QUERY_FLAG (op, FLAG_GENERATOR))
1001 { 947 {
1002 total_exp += op->stats.exp; 948 total_exp += op->stats.exp;
1003 949
1004 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 950 if (archetype *at = op->other_arch)
951 {
1005 total_exp += at->clone.stats.exp * 8; 952 total_exp += at->stats.exp * 8;
1006
1007 monster_cnt++; 953 monster_cnt++;
954 }
955
956 for (object *inv = op->inv; inv; inv = inv->below)
957 {
958 total_exp += op->stats.exp * 8;
959 monster_cnt++;
960 }
1008 } 961 }
1009 } 962 }
1010 963
1011 avgexp = (double) total_exp / monster_cnt; 964 avgexp = (double) total_exp / monster_cnt;
1012 965
… …
1025 * postive values make it darker, negative make it brighter 978 * postive values make it darker, negative make it brighter
1026 */ 979 */
1027int 980int
1028maptile::change_map_light (int change) 981maptile::change_map_light (int change)
1029{ 982{
1030 int new_level = darkness + change;
1031
1032 /* Nothing to do */ 983 /* Nothing to do */
1033 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 984 if (!change)
1034 return 0; 985 return 0;
1035 986
1036 /* inform all players on the map */ 987 /* inform all players on the map */
1037 if (change > 0) 988 if (change > 0)
1038 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 989 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1039 else 990 else
1040 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 991 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1041 992
1042 /* Do extra checking. since darkness is a unsigned value, 993 darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1043 * we need to be extra careful about negative values.
1044 * In general, the checks below are only needed if change
1045 * is not +/-1
1046 */
1047 if (new_level < 0)
1048 darkness = 0;
1049 else if (new_level >= MAX_DARKNESS)
1050 darkness = MAX_DARKNESS;
1051 else
1052 darkness = new_level;
1053 994
1054 /* All clients need to get re-updated for the change */ 995 /* All clients need to get re-updated for the change */
1055 update_all_map_los (this); 996 update_all_map_los (this);
997
1056 return 1; 998 return 1;
1057} 999}
1058 1000
1059/* 1001/*
1060 * This function updates various attributes about a specific space 1002 * This function updates various attributes about a specific space
… …
1063 * through, etc) 1005 * through, etc)
1064 */ 1006 */
1065void 1007void
1066mapspace::update_ () 1008mapspace::update_ ()
1067{ 1009{
1068 object *tmp, *last = 0; 1010 object *last = 0;
1069 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1011 uint8 flags = P_UPTODATE, anywhere = 0;
1012 sint8 light = 0;
1070 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1013 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1071 1014
1072 //object *middle = 0; 1015 //object *middle = 0;
1073 //object *top = 0; 1016 //object *top = 0;
1074 //object *floor = 0; 1017 //object *floor = 0;
1075 // this seems to generate better code than using locals, above 1018 // this seems to generate better code than using locals, above
1076 object *&top = faces_obj[0] = 0; 1019 object *&top = faces_obj[0] = 0;
1077 object *&middle = faces_obj[1] = 0; 1020 object *&middle = faces_obj[1] = 0;
1078 object *&floor = faces_obj[2] = 0; 1021 object *&floor = faces_obj[2] = 0;
1079 1022
1080 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1023 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1081 { 1024 {
1082 /* This could be made additive I guess (two lights better than 1025 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1083 * one). But if so, it shouldn't be a simple additive - 2
1084 * light bulbs do not illuminate twice as far as once since
1085 * it is a dissapation factor that is cubed.
1086 */
1087 if (tmp->glow_radius > light)
1088 light = tmp->glow_radius; 1026 light += tmp->glow_radius;
1089 1027
1090 /* This call is needed in order to update objects the player 1028 /* This call is needed in order to update objects the player
1091 * is standing in that have animations (ie, grass, fire, etc). 1029 * is standing in that have animations (ie, grass, fire, etc).
1092 * However, it also causes the look window to be re-drawn 1030 * However, it also causes the look window to be re-drawn
1093 * 3 times each time the player moves, because many of the 1031 * 3 times each time the player moves, because many of the
… …
1112 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1050 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1113 { 1051 {
1114 middle = tmp; 1052 middle = tmp;
1115 anywhere = 1; 1053 anywhere = 1;
1116 } 1054 }
1055
1117 /* Find the highest visible face around. If equal 1056 /* Find the highest visible face around. If equal
1118 * visibilities, we still want the one nearer to the 1057 * visibilities, we still want the one nearer to the
1119 * top 1058 * top
1120 */ 1059 */
1121 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere)) 1060 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
… …
1140 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1079 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1141 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE; 1080 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1142 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC; 1081 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1143 } 1082 }
1144 1083
1145 this->light = light; 1084 this->light = min (light, MAX_LIGHT_RADIUS);
1146 this->flags_ = flags; 1085 this->flags_ = flags;
1147 this->move_block = move_block & ~move_allow; 1086 this->move_block = move_block & ~move_allow;
1148 this->move_on = move_on; 1087 this->move_on = move_on;
1149 this->move_off = move_off; 1088 this->move_off = move_off;
1150 this->move_slow = move_slow; 1089 this->move_slow = move_slow;
… …
1170 * 1) top face is set, need middle to be set. 1109 * 1) top face is set, need middle to be set.
1171 * 2) middle is set, need to set top. 1110 * 2) middle is set, need to set top.
1172 * 3) neither middle or top is set - need to set both. 1111 * 3) neither middle or top is set - need to set both.
1173 */ 1112 */
1174 1113
1175 for (tmp = last; tmp; tmp = tmp->below) 1114 for (object *tmp = last; tmp; tmp = tmp->below)
1176 { 1115 {
1177 /* Once we get to a floor, stop, since we already have a floor object */ 1116 /* Once we get to a floor, stop, since we already have a floor object */
1178 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1117 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1179 break; 1118 break;
1180 1119
… …
1232 vol += op->volume (); 1171 vol += op->volume ();
1233 1172
1234 return vol; 1173 return vol;
1235} 1174}
1236 1175
1237/* this updates the orig_map->tile_map[tile_num] value after finding 1176maptile *
1238 * the map. It also takes care of linking back the freshly found 1177maptile::tile_available (int dir, bool load)
1239 * maps tile_map values if it tiles back to this one. It returns
1240 * the value of orig_map->tile_map[tile_num].
1241 */
1242static inline maptile *
1243find_and_link (maptile *orig_map, int tile_num)
1244{ 1178{
1245 maptile *mp = orig_map->tile_map [tile_num]; 1179 if (tile_path[dir])
1246
1247 if (!mp)
1248 {
1249 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1250
1251 if (!mp)
1252 {
1253 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1254 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1255 &orig_map->tile_path[tile_num], &orig_map->path);
1256 mp = new maptile (1, 1);
1257 mp->alloc ();
1258 mp->in_memory = MAP_IN_MEMORY;
1259 }
1260 } 1180 {
1181 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1182 return tile_map[dir];
1261 1183
1262 int dest_tile = (tile_num + 2) % 4; 1184 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1185 return tile_map[dir];
1186 }
1263 1187
1264 orig_map->tile_map [tile_num] = mp;
1265
1266 // optimisation: back-link map to origin map if euclidean
1267 //TODO: non-euclidean maps MUST GO
1268 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1269 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1270
1271 return mp; 1188 return 0;
1272}
1273
1274static inline void
1275load_and_link (maptile *orig_map, int tile_num)
1276{
1277 find_and_link (orig_map, tile_num)->load_sync ();
1278} 1189}
1279 1190
1280/* this returns TRUE if the coordinates (x,y) are out of 1191/* this returns TRUE if the coordinates (x,y) are out of
1281 * map m. This function also takes into account any 1192 * map m. This function also takes into account any
1282 * tiling considerations, loading adjacant maps as needed. 1193 * tiling considerations, loading adjacant maps as needed.
… …
1295 if (!m) 1206 if (!m)
1296 return 0; 1207 return 0;
1297 1208
1298 if (x < 0) 1209 if (x < 0)
1299 { 1210 {
1300 if (!m->tile_path[3]) 1211 if (!m->tile_available (3))
1301 return 1; 1212 return 1;
1302 1213
1303 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1304 find_and_link (m, 3);
1305
1306 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1214 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1307 } 1215 }
1308 1216
1309 if (x >= m->width) 1217 if (x >= m->width)
1310 { 1218 {
1311 if (!m->tile_path[1]) 1219 if (!m->tile_available (1))
1312 return 1; 1220 return 1;
1313 1221
1314 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1315 find_and_link (m, 1);
1316
1317 return out_of_map (m->tile_map[1], x - m->width, y); 1222 return out_of_map (m->tile_map[1], x - m->width, y);
1318 } 1223 }
1319 1224
1320 if (y < 0) 1225 if (y < 0)
1321 { 1226 {
1322 if (!m->tile_path[0]) 1227 if (!m->tile_available (0))
1323 return 1; 1228 return 1;
1324 1229
1325 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1326 find_and_link (m, 0);
1327
1328 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1230 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1329 } 1231 }
1330 1232
1331 if (y >= m->height) 1233 if (y >= m->height)
1332 { 1234 {
1333 if (!m->tile_path[2]) 1235 if (!m->tile_available (2))
1334 return 1; 1236 return 1;
1335
1336 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1337 find_and_link (m, 2);
1338 1237
1339 return out_of_map (m->tile_map[2], x, y - m->height); 1238 return out_of_map (m->tile_map[2], x, y - m->height);
1340 } 1239 }
1341 1240
1342 /* Simple case - coordinates are within this local 1241 /* Simple case - coordinates are within this local
… …
1356maptile * 1255maptile *
1357maptile::xy_find (sint16 &x, sint16 &y) 1256maptile::xy_find (sint16 &x, sint16 &y)
1358{ 1257{
1359 if (x < 0) 1258 if (x < 0)
1360 { 1259 {
1361 if (!tile_path[3]) 1260 if (!tile_available (3))
1362 return 0; 1261 return 0;
1363 1262
1364 find_and_link (this, 3);
1365 x += tile_map[3]->width; 1263 x += tile_map[3]->width;
1366 return tile_map[3]->xy_find (x, y); 1264 return tile_map[3]->xy_find (x, y);
1367 } 1265 }
1368 1266
1369 if (x >= width) 1267 if (x >= width)
1370 { 1268 {
1371 if (!tile_path[1]) 1269 if (!tile_available (1))
1372 return 0; 1270 return 0;
1373 1271
1374 find_and_link (this, 1);
1375 x -= width; 1272 x -= width;
1376 return tile_map[1]->xy_find (x, y); 1273 return tile_map[1]->xy_find (x, y);
1377 } 1274 }
1378 1275
1379 if (y < 0) 1276 if (y < 0)
1380 { 1277 {
1381 if (!tile_path[0]) 1278 if (!tile_available (0))
1382 return 0; 1279 return 0;
1383 1280
1384 find_and_link (this, 0);
1385 y += tile_map[0]->height; 1281 y += tile_map[0]->height;
1386 return tile_map[0]->xy_find (x, y); 1282 return tile_map[0]->xy_find (x, y);
1387 } 1283 }
1388 1284
1389 if (y >= height) 1285 if (y >= height)
1390 { 1286 {
1391 if (!tile_path[2]) 1287 if (!tile_available (2))
1392 return 0; 1288 return 0;
1393 1289
1394 find_and_link (this, 2);
1395 y -= height; 1290 y -= height;
1396 return tile_map[2]->xy_find (x, y); 1291 return tile_map[2]->xy_find (x, y);
1397 } 1292 }
1398 1293
1399 /* Simple case - coordinates are within this local 1294 /* Simple case - coordinates are within this local
… …
1410adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1305adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1411{ 1306{
1412 if (!map1 || !map2) 1307 if (!map1 || !map2)
1413 return 0; 1308 return 0;
1414 1309
1415 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1310 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1416 //fix: compare paths instead (this is likely faster, too!) 1311 //fix: compare paths instead (this is likely faster, too!)
1417 if (map1 == map2) 1312 if (map1 == map2)
1418 { 1313 {
1419 *dx = 0; 1314 *dx = 0;
1420 *dy = 0; 1315 *dy = 0;
… …
1602 else 1497 else
1603 { 1498 {
1604 retval->distance_x += op2->x - x; 1499 retval->distance_x += op2->x - x;
1605 retval->distance_y += op2->y - y; 1500 retval->distance_y += op2->y - y;
1606 1501
1607 retval->part = NULL; 1502 retval->part = 0;
1608 retval->distance = idistance (retval->distance_x, retval->distance_y); 1503 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1609 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1504 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1610 } 1505 }
1611} 1506}
1612 1507
1613/* Returns true of op1 and op2 are effectively on the same map 1508/* Returns true of op1 and op2 are effectively on the same map
… …
1627} 1522}
1628 1523
1629object * 1524object *
1630maptile::insert (object *op, int x, int y, object *originator, int flags) 1525maptile::insert (object *op, int x, int y, object *originator, int flags)
1631{ 1526{
1632 if (!op->flag [FLAG_REMOVED])
1633 op->remove ();
1634
1635 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1527 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1636} 1528}
1637 1529
1638region * 1530region *
1639maptile::region (int x, int y) const 1531maptile::region (int x, int y) const
… …
1649 1541
1650 return ::region::default_region (); 1542 return ::region::default_region ();
1651} 1543}
1652 1544
1653/* picks a random object from a style map. 1545/* picks a random object from a style map.
1654 * Redone by MSW so it should be faster and not use static
1655 * variables to generate tables.
1656 */ 1546 */
1657object * 1547object *
1658maptile::pick_random_object () const 1548maptile::pick_random_object (rand_gen &gen) const
1659{ 1549{
1660 /* while returning a null object will result in a crash, that 1550 /* while returning a null object will result in a crash, that
1661 * is actually preferable to an infinite loop. That is because 1551 * is actually preferable to an infinite loop. That is because
1662 * most servers will automatically restart in case of crash. 1552 * most servers will automatically restart in case of crash.
1663 * Change the logic on getting the random space - shouldn't make 1553 * Change the logic on getting the random space - shouldn't make
1664 * any difference, but this seems clearer to me. 1554 * any difference, but this seems clearer to me.
1665 */ 1555 */
1666 for (int i = 1000; --i;) 1556 for (int i = 1000; --i;)
1667 { 1557 {
1668 object *pick = at (rndm (width), rndm (height)).bot; 1558 object *pick = at (gen (width), gen (height)).bot;
1669 1559
1670 // do not prefer big monsters just because they are big. 1560 // do not prefer big monsters just because they are big.
1671 if (pick && pick->head_ () == pick) 1561 if (pick && pick->is_head ())
1672 return pick->head_ (); 1562 return pick->head_ ();
1673 } 1563 }
1674 1564
1675 // instead of crashing in the unlikely(?) case, try to return *something* 1565 // instead of crashing in the unlikely(?) case, try to return *something*
1676 return get_archetype ("blocked"); 1566 return archetype::find ("bug");
1677} 1567}
1678 1568
1569void
1570maptile::play_sound (faceidx sound, int x, int y) const
1571{
1572 if (!sound)
1573 return;
1574
1575 for_all_players_on_map (pl, this)
1576 if (client *ns = pl->ns)
1577 {
1578 int dx = x - pl->ob->x;
1579 int dy = y - pl->ob->y;
1580
1581 int distance = idistance (dx, dy);
1582
1583 if (distance <= MAX_SOUND_DISTANCE)
1584 ns->play_sound (sound, dx, dy);
1585 }
1586}
1587
1588void
1589maptile::say_msg (const char *msg, int x, int y) const
1590{
1591 for_all_players (pl)
1592 if (client *ns = pl->ns)
1593 {
1594 int dx = x - pl->ob->x;
1595 int dy = y - pl->ob->y;
1596
1597 int distance = idistance (dx, dy);
1598
1599 if (distance <= MAX_SOUND_DISTANCE)
1600 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1601 }
1602}
1603
1604static void
1605split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1606{
1607 // clip to map to the left
1608 if (x0 < 0)
1609 {
1610 if (maptile *tile = m->tile_available (TILE_LEFT, 1))
1611 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1612
1613 if (x1 < 0) // entirely to the left
1614 return;
1615
1616 x0 = 0;
1617 }
1618
1619 // clip to map to the right
1620 if (x1 > m->width)
1621 {
1622 if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
1623 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1624
1625 if (x0 > m->width) // entirely to the right
1626 return;
1627
1628 x1 = m->width;
1629 }
1630
1631 // clip to map above
1632 if (y0 < 0)
1633 {
1634 if (maptile *tile = m->tile_available (TILE_UP, 1))
1635 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1636
1637 if (y1 < 0) // entirely above
1638 return;
1639
1640 y0 = 0;
1641 }
1642
1643 // clip to map below
1644 if (y1 > m->height)
1645 {
1646 if (maptile *tile = m->tile_available (TILE_DOWN, 1))
1647 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1648
1649 if (y0 > m->height) // entirely below
1650 return;
1651
1652 y1 = m->height;
1653 }
1654
1655 // if we get here, the rect is within the current map
1656 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1657
1658 r->m = m;
1659 r->x0 = x0;
1660 r->y0 = y0;
1661 r->x1 = x1;
1662 r->y1 = y1;
1663 r->dx = dx;
1664 r->dy = dy;
1665}
1666
1667maprect *
1668maptile::split_to_tiles (int x0, int y0, int x1, int y1)
1669{
1670 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1671 buf.clear ();
1672
1673 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1674
1675 // add end marker
1676 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1677 r->m = 0;
1678
1679 return (maprect *)buf.linearise ();
1680}
1681

Diff Legend

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