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.134 by root, Tue Apr 15 14:21:04 2008 UTC vs.
Revision 1.223 by root, Wed Dec 5 19:03:26 2018 UTC

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

Diff Legend

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