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.114 by root, Thu Jul 26 00:27:07 2007 UTC vs.
Revision 1.206 by root, Wed May 4 16:12:15 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines