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.165 by root, Tue Oct 20 05:57:08 2009 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 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" 28#include "loader.h"
30
31#include "path.h" 29#include "path.h"
30
31sint8 maptile::outdoor_darkness;
32 32
33/* This rolls up wall, blocks_magic, blocks_view, etc, all into 33/* This rolls up wall, blocks_magic, blocks_view, etc, all into
34 * one function that just returns a P_.. value (see map.h) 34 * one function that just returns a P_.. value (see map.h)
35 * it will also do map translation for tiled maps, returning 35 * it will also do map translation for tiled maps, returning
36 * new values into newmap, nx, and ny. Any and all of those 36 * new values into newmap, nx, and ny. Any and all of those
… …
71 * by the caller. 71 * by the caller.
72 */ 72 */
73int 73int
74blocked_link (object *ob, maptile *m, int sx, int sy) 74blocked_link (object *ob, maptile *m, int sx, int sy)
75{ 75{
76 object *tmp;
77 int mflags, blocked;
78
79 /* Make sure the coordinates are valid - they should be, as caller should 76 /* Make sure the coordinates are valid - they should be, as caller should
80 * have already checked this. 77 * have already checked this.
81 */ 78 */
82 if (OUT_OF_REAL_MAP (m, sx, sy)) 79 if (OUT_OF_REAL_MAP (m, sx, sy))
83 { 80 {
… …
86 } 83 }
87 84
88 /* Save some cycles - instead of calling get_map_flags(), just get the value 85 /* Save some cycles - instead of calling get_map_flags(), just get the value
89 * directly. 86 * directly.
90 */ 87 */
91 mflags = m->at (sx, sy).flags (); 88 mapspace &ms = m->at (sx, sy);
92 89
93 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 90 int mflags = ms.flags ();
91 int blocked = ms.move_block;
94 92
95 /* If space is currently not blocked by anything, no need to 93 /* If space is currently not blocked by anything, no need to
96 * go further. Not true for players - all sorts of special 94 * go further. Not true for players - all sorts of special
97 * things we need to do for players. 95 * things we need to do for players.
98 */ 96 */
99 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 97 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
100 return 0; 98 return 0;
101 99
102 /* if there isn't anytyhing alive on this space, and this space isn't 100 /* if there isn't anything alive on this space, and this space isn't
103 * otherwise blocked, we can return now. Only if there is a living 101 * otherwise blocked, we can return now. Only if there is a living
104 * creature do we need to investigate if it is part of this creature 102 * creature do we need to investigate if it is part of this creature
105 * or another. Likewise, only if something is blocking us do we 103 * or another. Likewise, only if something is blocking us do we
106 * need to investigate if there is a special circumstance that would 104 * need to investigate if there is a special circumstance that would
107 * let the player through (inventory checkers for example) 105 * let the player through (inventory checkers for example)
… …
114 /* We basically go through the stack of objects, and if there is 112 /* We basically go through the stack of objects, and if there is
115 * some other object that has NO_PASS or FLAG_ALIVE set, return 113 * some other object that has NO_PASS or FLAG_ALIVE set, return
116 * true. If we get through the entire stack, that must mean 114 * true. If we get through the entire stack, that must mean
117 * ob is blocking it, so return 0. 115 * ob is blocking it, so return 0.
118 */ 116 */
119 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 117 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
120 { 118 {
121 119 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 { 120 {
125 /* If last_sp is set, the player/monster needs an object, 121 if (tmp->type == CHECK_INV)
126 * so we check for it. If they don't have it, they can't
127 * pass through this space.
128 */
129 if (tmp->last_sp)
130 { 122 {
131 if (check_inv_recursive (ob, tmp) == NULL) 123 bool have = check_inv_recursive (ob, tmp);
124
125 // last_sp set means we block if we don't have.
126 if (logical_xor (have, tmp->last_sp))
132 return 1; 127 return 1;
133 else 128 }
134 continue; 129 else if (tmp->type == T_MATCH)
130 {
131 // T_MATCH allows "entrance" iff the match is true
132 // == blocks if the match fails
133
134 // we could have used an INVOKE_OBJECT, but decided against it, as we
135 // assume that T_MATCH is very common.
136 if (!match (tmp->slaying, ob, tmp, ob))
137 return 1;
135 } 138 }
136 else 139 else
137 { 140 return 1; // unconditional block
138 /* In this case, the player must not have the object - 141
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 142 } else {
148 { 143 // space does not block the ob, directly, but
149 /* Broke apart a big nasty if into several here to make 144 // anything alive that is not a door still
150 * this more readable. first check - if the space blocks 145 // blocks anything but wizards.
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 146
158 if (tmp->flag [FLAG_ALIVE] 147 if (tmp->flag [FLAG_ALIVE]
159 && tmp->head_ () != ob 148 && tmp->head_ () != ob
160 && tmp != ob 149 && tmp != ob
161 && tmp->type != DOOR 150 && tmp->type != DOOR
162 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden)) 151 && !tmp->flag [FLAG_WIZPASS])
163 return 1; 152 return 1;
164 } 153 }
165
166 } 154 }
155
167 return 0; 156 return 0;
168} 157}
169 158
170/* 159/*
171 * Returns true if the given object can't fit in the given spot. 160 * Returns qthe blocking object if the given object can't fit in the given
172 * This is meant for multi space objects - for single space objecs, 161 * spot. This is meant for multi space objects - for single space objecs,
173 * just calling get_map_blocked and checking that against movement type 162 * just calling get_map_blocked and checking that against movement type
174 * of object. This function goes through all the parts of the 163 * of object. This function goes through all the parts of the multipart
175 * multipart object and makes sure they can be inserted. 164 * object and makes sure they can be inserted.
176 * 165 *
177 * While this doesn't call out of map, the get_map_flags does. 166 * While this doesn't call out of map, the get_map_flags does.
178 * 167 *
179 * This function has been used to deprecate arch_out_of_map - 168 * This function has been used to deprecate arch_out_of_map -
180 * this function also does that check, and since in most cases, 169 * this function also does that check, and since in most cases,
… …
191 * 180 *
192 * Note this used to be arch_blocked, but with new movement 181 * Note this used to be arch_blocked, but with new movement
193 * code, we need to have actual object to check its move_type 182 * code, we need to have actual object to check its move_type
194 * against the move_block values. 183 * against the move_block values.
195 */ 184 */
196int 185bool
197ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 186object::blocked (maptile *m, int x, int y) const
198{ 187{
199 archetype *tmp; 188 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 } 189 {
190 mapxy pos (m, x + tmp->x, y + tmp->y);
213 191
214 for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more) 192 if (!pos.normalise ())
215 { 193 return 1;
216 flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
217 194
218 if (flag & P_OUT_OF_MAP) 195 mapspace &ms = *pos;
219 return P_OUT_OF_MAP; 196
220 if (flag & P_IS_ALIVE) 197 if (ms.flags () & P_IS_ALIVE)
221 return P_IS_ALIVE; 198 return 1;
222 199
223 mapspace &ms = m1->at (sx, sy); 200 /* However, often ob doesn't have any move type
224 201 * (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. 202 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
228 */ 203 */
229
230 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 204 if (!move_type && ms.move_block != MOVE_ALL)
231 continue; 205 continue;
232 206
233 /* Note it is intentional that we check ob - the movement type of the 207 /* Note it is intentional that we check ob - the movement type of the
234 * head of the object should correspond for the entire object. 208 * head of the object should correspond for the entire object.
235 */ 209 */
236 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 210 if (ms.blocks (move_type))
237 return P_NO_PASS; 211 return 1;
238 } 212 }
239 213
240 return 0; 214 return 0;
241} 215}
242 216
… …
260 234
261 insert_ob_in_ob (tmp, container); 235 insert_ob_in_ob (tmp, container);
262 tmp = next; 236 tmp = next;
263 } 237 }
264 238
265 /* sum_weight will go through and calculate what all the containers are 239 // go through and calculate what all the containers are carrying.
266 * carrying. 240 //TODO: remove
267 */ 241 container->update_weight ();
268 sum_weight (container);
269} 242}
270 243
271void 244void
272maptile::set_object_flag (int flag, int value) 245maptile::set_object_flag (int flag, int value)
273{ 246{
… …
275 return; 248 return;
276 249
277 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 250 for (mapspace *ms = spaces + size (); ms-- > spaces; )
278 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 251 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
279 tmp->flag [flag] = value; 252 tmp->flag [flag] = value;
253}
254
255void
256maptile::post_load_original ()
257{
258 if (!spaces)
259 return;
260
261 set_object_flag (FLAG_OBJ_ORIGINAL);
262
263 for (mapspace *ms = spaces + size (); ms-- > spaces; )
264 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
265 INVOKE_OBJECT (RESET, tmp);
280} 266}
281 267
282/* link_multipart_objects go through all the objects on the map looking 268/* link_multipart_objects go through all the objects on the map looking
283 * for objects whose arch says they are multipart yet according to the 269 * for objects whose arch says they are multipart yet according to the
284 * info we have, they only have the head (as would be expected when 270 * info we have, they only have the head (as would be expected when
… …
322bool 308bool
323maptile::_load_objects (object_thawer &f) 309maptile::_load_objects (object_thawer &f)
324{ 310{
325 for (;;) 311 for (;;)
326 { 312 {
327 coroapi::cede_to_tick_every (100); // cede once in a while 313 coroapi::cede_to_tick (); // cede once in a while
328 314
329 switch (f.kw) 315 switch (f.kw)
330 { 316 {
331 case KW_arch: 317 case KW_arch:
332 if (object *op = object::read (f, this)) 318 if (object *op = object::read (f, this))
333 { 319 {
320 // TODO: why?
334 if (op->inv) 321 if (op->inv)
335 sum_weight (op); 322 op->update_weight ();
336 323
337 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 324 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
325 {
326 // we insert manually because
327 // a) its way faster
328 // b) we remove manually, too, and there are good reasons for that
329 // c) it's correct
330 mapspace &ms = at (op->x, op->y);
331
332 op->flag [FLAG_REMOVED] = false;
333
334 op->above = 0;
335 op->below = ms.top;
336
337 *(ms.top ? &ms.top->above : &ms.bot) = op;
338
339 ms.top = op;
340 ms.flags_ = 0;
341 }
342 else
343 {
344 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
345 op->destroy ();
346 }
338 } 347 }
339 348
340 continue; 349 continue;
341 350
342 case KW_EOF: 351 case KW_EOF:
… …
355} 364}
356 365
357void 366void
358maptile::activate () 367maptile::activate ()
359{ 368{
360 active = true;
361
362 if (spaces) 369 if (spaces)
363 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 370 for (mapspace *ms = spaces + size (); ms-- > spaces; )
364 for (object *op = ms->bot; op; op = op->above) 371 for (object *op = ms->bot; op; op = op->above)
365 op->activate_recursive (); 372 op->activate_recursive ();
366} 373}
367 374
368void 375void
369maptile::deactivate () 376maptile::deactivate ()
370{ 377{
371 active = false;
372
373 if (spaces) 378 if (spaces)
374 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 379 for (mapspace *ms = spaces + size (); ms-- > spaces; )
375 for (object *op = ms->bot; op; op = op->above) 380 for (object *op = ms->bot; op; op = op->above)
376 op->deactivate_recursive (); 381 op->deactivate_recursive ();
377} 382}
… …
387 if (!spaces) 392 if (!spaces)
388 return false; 393 return false;
389 394
390 for (int i = 0; i < size (); ++i) 395 for (int i = 0; i < size (); ++i)
391 { 396 {
392 int unique = 0; 397 bool unique = 0;
398
393 for (object *op = spaces [i].bot; op; op = op->above) 399 for (object *op = spaces [i].bot; op; op = op->above)
394 { 400 {
395 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 401 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
396 unique = 1;
397 402
398 if (!op->can_map_save ()) 403 if (expect_false (!op->can_map_save ()))
399 continue; 404 continue;
400 405
401 if (unique || op->flag [FLAG_UNIQUE]) 406 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
402 { 407 {
403 if (flags & IO_UNIQUES) 408 if (flags & IO_UNIQUES)
404 op->write (f); 409 op->write (f);
405 } 410 }
406 else if (flags & IO_OBJECTS) 411 else if (expect_true (flags & IO_OBJECTS))
407 op->write (f); 412 op->write (f);
408 } 413 }
409 } 414 }
410 415
411 coroapi::cede_to_tick (); 416 coroapi::cede_to_tick ();
412 417
413 return true; 418 return true;
414}
415
416bool
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} 419}
437 420
438bool 421bool
439maptile::_save_objects (const char *path, int flags) 422maptile::_save_objects (const char *path, int flags)
440{ 423{
… …
571 return items; 554 return items;
572} 555}
573 556
574/* opposite of parse string, this puts the string that was originally fed in to 557/* opposite of parse string, this puts the string that was originally fed in to
575 * the map (or something equivilent) into output_string. */ 558 * the map (or something equivilent) into output_string. */
576static void 559static const char *
577print_shop_string (maptile *m, char *output_string) 560print_shop_string (maptile *m)
578{ 561{
579 int i; 562 static dynbuf_text buf; buf.clear ();
580 char tmp[MAX_BUF];
581 563
582 strcpy (output_string, "");
583 for (i = 0; i < m->shopitems[0].index; i++) 564 for (int i = 0; i < m->shopitems[0].index; i++)
584 { 565 {
585 if (m->shopitems[i].typenum) 566 if (m->shopitems[i].typenum)
586 { 567 {
587 if (m->shopitems[i].strength) 568 if (m->shopitems[i].strength)
588 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 569 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
589 else 570 else
590 sprintf (tmp, "%s;", m->shopitems[i].name); 571 buf.printf ("%s;", m->shopitems[i].name);
591 } 572 }
592 else 573 else
593 { 574 {
594 if (m->shopitems[i].strength) 575 if (m->shopitems[i].strength)
595 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 576 buf.printf ("*:%d;", m->shopitems[i].strength);
596 else 577 else
597 sprintf (tmp, "*"); 578 buf.printf ("*");
598 } 579 }
599
600 strcat (output_string, tmp);
601 } 580 }
581
582 return buf;
602} 583}
603 584
604/* This loads the header information of the map. The header 585/* This loads the header information of the map. The header
605 * contains things like difficulty, size, timeout, etc. 586 * contains things like difficulty, size, timeout, etc.
606 * this used to be stored in the map object, but with the 587 * this used to be stored in the map object, but with the
… …
615bool 596bool
616maptile::_load_header (object_thawer &thawer) 597maptile::_load_header (object_thawer &thawer)
617{ 598{
618 for (;;) 599 for (;;)
619 { 600 {
620 thawer.next ();
621
622 switch (thawer.kw) 601 switch (thawer.kw)
623 { 602 {
624 case KW_msg: 603 case KW_msg:
625 thawer.get_ml (KW_endmsg, msg); 604 thawer.get_ml (KW_endmsg, msg);
626 break; 605 break;
… …
660 case KW_sky: thawer.get (sky); break; 639 case KW_sky: thawer.get (sky); break;
661 640
662 case KW_per_player: thawer.get (per_player); break; 641 case KW_per_player: thawer.get (per_player); break;
663 case KW_per_party: thawer.get (per_party); break; 642 case KW_per_party: thawer.get (per_party); break;
664 case KW_no_reset: thawer.get (no_reset); break; 643 case KW_no_reset: thawer.get (no_reset); break;
644 case KW_no_drop: thawer.get (no_drop); break;
665 645
666 case KW_region: default_region = region::find (thawer.get_str ()); break; 646 case KW_region: default_region = region::find (thawer.get_str ()); break;
667 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 647 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
668 648
669 // old names new names 649 // old names new names
… …
681 case KW_tile_path_2: thawer.get (tile_path [1]); break; 661 case KW_tile_path_2: thawer.get (tile_path [1]); break;
682 case KW_tile_path_3: thawer.get (tile_path [2]); break; 662 case KW_tile_path_3: thawer.get (tile_path [2]); break;
683 case KW_tile_path_4: thawer.get (tile_path [3]); break; 663 case KW_tile_path_4: thawer.get (tile_path [3]); break;
684 664
685 case KW_ERROR: 665 case KW_ERROR:
686 set_key (thawer.kw_str, thawer.value); 666 set_key_text (thawer.kw_str, thawer.value);
687 break; 667 break;
688 668
689 case KW_end: 669 case KW_end:
670 thawer.next ();
690 return true; 671 return true;
691 672
692 default: 673 default:
693 if (!thawer.parse_error ("map", 0)) 674 if (!thawer.parse_error ("map", 0))
694 return false; 675 return false;
695 break; 676 break;
696 } 677 }
678
679 thawer.next ();
697 } 680 }
698 681
699 abort (); 682 abort ();
700}
701
702bool
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} 683}
712 684
713/****************************************************************************** 685/******************************************************************************
714 * This is the start of unique map handling code 686 * This is the start of unique map handling code
715 *****************************************************************************/ 687 *****************************************************************************/
… …
727 699
728 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 700 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
729 unique = 1; 701 unique = 1;
730 702
731 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 703 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
732 {
733 op->destroy_inv (false);
734 op->destroy (); 704 op->destroy ();
735 }
736 705
737 op = above; 706 op = above;
738 } 707 }
739 } 708 }
740} 709}
… …
751 MAP_OUT (swap_time); 720 MAP_OUT (swap_time);
752 MAP_OUT (reset_time); 721 MAP_OUT (reset_time);
753 MAP_OUT (reset_timeout); 722 MAP_OUT (reset_timeout);
754 MAP_OUT (fixed_resettime); 723 MAP_OUT (fixed_resettime);
755 MAP_OUT (no_reset); 724 MAP_OUT (no_reset);
725 MAP_OUT (no_drop);
756 MAP_OUT (difficulty); 726 MAP_OUT (difficulty);
757
758 if (default_region) MAP_OUT2 (region, default_region->name); 727 if (default_region) MAP_OUT2 (region, default_region->name);
759 728
760 if (shopitems) 729 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); 730 MAP_OUT (shopgreed);
768 MAP_OUT (shopmin); 731 MAP_OUT (shopmin);
769 MAP_OUT (shopmax); 732 MAP_OUT (shopmax);
770 if (shoprace) MAP_OUT (shoprace); 733 if (shoprace) MAP_OUT (shoprace);
734
771 MAP_OUT (darkness); 735 MAP_OUT (darkness);
772 MAP_OUT (width); 736 MAP_OUT (width);
773 MAP_OUT (height); 737 MAP_OUT (height);
774 MAP_OUT (enter_x); 738 MAP_OUT (enter_x);
775 MAP_OUT (enter_y); 739 MAP_OUT (enter_y);
… …
814 * Remove and free all objects in the given map. 778 * Remove and free all objects in the given map.
815 */ 779 */
816void 780void
817maptile::clear () 781maptile::clear ()
818{ 782{
819 sfree (regions, size ()); regions = 0;
820 delete [] regionmap; regionmap = 0;
821
822 if (spaces) 783 if (spaces)
823 { 784 {
824 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 785 for (mapspace *ms = spaces + size (); ms-- > spaces; )
825 while (object *op = ms->bot) 786 while (object *op = ms->bot)
826 { 787 {
788 // manually remove, as to not trigger anything
789 if (ms->bot = op->above)
790 ms->bot->below = 0;
791
792 op->flag [FLAG_REMOVED] = true;
793
827 op = op->head_ (); 794 object *head = op->head_ ();
828 op->destroy_inv (false); 795 if (op == head)
829 op->destroy (); 796 op->destroy ();
797 else if (head->map != op->map)
798 {
799 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
800 head->destroy ();
801 }
830 } 802 }
831 803
832 sfree (spaces, size ()), spaces = 0; 804 sfree0 (spaces, size ());
833 } 805 }
834 806
835 if (buttons) 807 if (buttons)
836 free_objectlinkpt (buttons), buttons = 0; 808 free_objectlinkpt (buttons), buttons = 0;
809
810 sfree0 (regions, size ());
811 delete [] regionmap; regionmap = 0;
837} 812}
838 813
839void 814void
840maptile::clear_header () 815maptile::clear_header ()
841{ 816{
… …
893 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 868 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
894 break; 869 break;
895 870
896 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 871 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
897 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 872 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
898 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
899 || QUERY_FLAG (op, FLAG_UNIQUE) 873 || QUERY_FLAG (op, FLAG_UNIQUE)
900 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 874 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
901 || QUERY_FLAG (op, FLAG_UNPAID) 875 || QUERY_FLAG (op, FLAG_UNPAID)
902 || op->is_alive ()) 876 || op->is_alive ())
903 ; // do not decay 877 ; // do not decay
… …
942 op->destroy (); 916 op->destroy ();
943 } 917 }
944} 918}
945 919
946/* 920/*
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 }
968}
969
970/*
971 * This routine is supposed to find out the difficulty of the map. 921 * This routine is supposed to find out the difficulty of the map.
972 * difficulty does not have a lot to do with character level, 922 * difficulty does not have a lot to do with character level,
973 * but does have a lot to do with treasure on the map. 923 * but does have a lot to do with treasure on the map.
974 * 924 *
975 * Difficulty can now be set by the map creature. If the value stored 925 * Difficulty can now be set by the map creator. If the value stored
976 * in the map is zero, then use this routine. Maps should really 926 * in the map is zero, then use this routine. Maps should really
977 * have a difficulty set than using this function - human calculation 927 * have a difficulty set rather than using this function - human calculation
978 * is much better than this functions guesswork. 928 * is much better than this function's guesswork.
979 */ 929 */
980int 930int
981maptile::estimate_difficulty () const 931maptile::estimate_difficulty () const
982{ 932{
983 long monster_cnt = 0; 933 long monster_cnt = 0;
… …
995 945
996 if (QUERY_FLAG (op, FLAG_GENERATOR)) 946 if (QUERY_FLAG (op, FLAG_GENERATOR))
997 { 947 {
998 total_exp += op->stats.exp; 948 total_exp += op->stats.exp;
999 949
1000 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 950 if (archetype *at = op->other_arch)
951 {
1001 total_exp += at->stats.exp * 8; 952 total_exp += at->stats.exp * 8;
1002
1003 monster_cnt++; 953 monster_cnt++;
954 }
955
956 for (object *inv = op->inv; inv; inv = inv->below)
957 {
958 total_exp += op->stats.exp * 8;
959 monster_cnt++;
960 }
1004 } 961 }
1005 } 962 }
1006 963
1007 avgexp = (double) total_exp / monster_cnt; 964 avgexp = (double) total_exp / monster_cnt;
1008 965
… …
1021 * postive values make it darker, negative make it brighter 978 * postive values make it darker, negative make it brighter
1022 */ 979 */
1023int 980int
1024maptile::change_map_light (int change) 981maptile::change_map_light (int change)
1025{ 982{
1026 int new_level = darkness + change;
1027
1028 /* Nothing to do */ 983 /* Nothing to do */
1029 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 984 if (!change)
1030 return 0; 985 return 0;
1031 986
1032 /* inform all players on the map */ 987 /* inform all players on the map */
1033 if (change > 0) 988 if (change > 0)
1034 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 989 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1035 else 990 else
1036 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 991 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1037 992
1038 /* Do extra checking. since darkness is a unsigned value, 993 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 994
1050 /* All clients need to get re-updated for the change */ 995 /* All clients need to get re-updated for the change */
1051 update_all_map_los (this); 996 update_all_map_los (this);
997
1052 return 1; 998 return 1;
1053} 999}
1054 1000
1055/* 1001/*
1056 * This function updates various attributes about a specific space 1002 * This function updates various attributes about a specific space
… …
1059 * through, etc) 1005 * through, etc)
1060 */ 1006 */
1061void 1007void
1062mapspace::update_ () 1008mapspace::update_ ()
1063{ 1009{
1064 object *tmp, *last = 0; 1010 object *last = 0;
1065 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1011 uint8 flags = P_UPTODATE, anywhere = 0;
1012 sint8 light = 0;
1066 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1013 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1067 1014
1068 //object *middle = 0; 1015 //object *middle = 0;
1069 //object *top = 0; 1016 //object *top = 0;
1070 //object *floor = 0; 1017 //object *floor = 0;
1071 // this seems to generate better code than using locals, above 1018 // this seems to generate better code than using locals, above
1072 object *&top = faces_obj[0] = 0; 1019 object *&top = faces_obj[0] = 0;
1073 object *&middle = faces_obj[1] = 0; 1020 object *&middle = faces_obj[1] = 0;
1074 object *&floor = faces_obj[2] = 0; 1021 object *&floor = faces_obj[2] = 0;
1075 1022
1076 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1023 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1077 { 1024 {
1078 /* This could be made additive I guess (two lights better than 1025 // 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; 1026 light += tmp->glow_radius;
1085 1027
1086 /* This call is needed in order to update objects the player 1028 /* This call is needed in order to update objects the player
1087 * is standing in that have animations (ie, grass, fire, etc). 1029 * is standing in that have animations (ie, grass, fire, etc).
1088 * However, it also causes the look window to be re-drawn 1030 * However, it also causes the look window to be re-drawn
1089 * 3 times each time the player moves, because many of the 1031 * 3 times each time the player moves, because many of the
… …
1108 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1050 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1109 { 1051 {
1110 middle = tmp; 1052 middle = tmp;
1111 anywhere = 1; 1053 anywhere = 1;
1112 } 1054 }
1055
1113 /* Find the highest visible face around. If equal 1056 /* Find the highest visible face around. If equal
1114 * visibilities, we still want the one nearer to the 1057 * visibilities, we still want the one nearer to the
1115 * top 1058 * top
1116 */ 1059 */
1117 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere)) 1060 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
… …
1136 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1079 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1137 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE; 1080 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1138 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC; 1081 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1139 } 1082 }
1140 1083
1141 this->light = light; 1084 this->light = min (light, MAX_LIGHT_RADIUS);
1142 this->flags_ = flags; 1085 this->flags_ = flags;
1143 this->move_block = move_block & ~move_allow; 1086 this->move_block = move_block & ~move_allow;
1144 this->move_on = move_on; 1087 this->move_on = move_on;
1145 this->move_off = move_off; 1088 this->move_off = move_off;
1146 this->move_slow = move_slow; 1089 this->move_slow = move_slow;
… …
1166 * 1) top face is set, need middle to be set. 1109 * 1) top face is set, need middle to be set.
1167 * 2) middle is set, need to set top. 1110 * 2) middle is set, need to set top.
1168 * 3) neither middle or top is set - need to set both. 1111 * 3) neither middle or top is set - need to set both.
1169 */ 1112 */
1170 1113
1171 for (tmp = last; tmp; tmp = tmp->below) 1114 for (object *tmp = last; tmp; tmp = tmp->below)
1172 { 1115 {
1173 /* Once we get to a floor, stop, since we already have a floor object */ 1116 /* Once we get to a floor, stop, since we already have a floor object */
1174 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1117 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1175 break; 1118 break;
1176 1119
… …
1228 vol += op->volume (); 1171 vol += op->volume ();
1229 1172
1230 return vol; 1173 return vol;
1231} 1174}
1232 1175
1233/* this updates the orig_map->tile_map[tile_num] value after finding 1176maptile *
1234 * the map. It also takes care of linking back the freshly found 1177maptile::tile_available (int dir, bool load)
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{ 1178{
1241 maptile *mp = orig_map->tile_map [tile_num]; 1179 if (tile_path[dir])
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 } 1180 {
1181 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1182 return tile_map[dir];
1257 1183
1258 int dest_tile = (tile_num + 2) % 4; 1184 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1185 return tile_map[dir];
1186 }
1259 1187
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; 1188 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} 1189}
1275 1190
1276/* this returns TRUE if the coordinates (x,y) are out of 1191/* this returns TRUE if the coordinates (x,y) are out of
1277 * map m. This function also takes into account any 1192 * map m. This function also takes into account any
1278 * tiling considerations, loading adjacant maps as needed. 1193 * tiling considerations, loading adjacant maps as needed.
… …
1291 if (!m) 1206 if (!m)
1292 return 0; 1207 return 0;
1293 1208
1294 if (x < 0) 1209 if (x < 0)
1295 { 1210 {
1296 if (!m->tile_path[3]) 1211 if (!m->tile_available (3))
1297 return 1; 1212 return 1;
1298 1213
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); 1214 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1303 } 1215 }
1304 1216
1305 if (x >= m->width) 1217 if (x >= m->width)
1306 { 1218 {
1307 if (!m->tile_path[1]) 1219 if (!m->tile_available (1))
1308 return 1; 1220 return 1;
1309 1221
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); 1222 return out_of_map (m->tile_map[1], x - m->width, y);
1314 } 1223 }
1315 1224
1316 if (y < 0) 1225 if (y < 0)
1317 { 1226 {
1318 if (!m->tile_path[0]) 1227 if (!m->tile_available (0))
1319 return 1; 1228 return 1;
1320 1229
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); 1230 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1325 } 1231 }
1326 1232
1327 if (y >= m->height) 1233 if (y >= m->height)
1328 { 1234 {
1329 if (!m->tile_path[2]) 1235 if (!m->tile_available (2))
1330 return 1; 1236 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 1237
1335 return out_of_map (m->tile_map[2], x, y - m->height); 1238 return out_of_map (m->tile_map[2], x, y - m->height);
1336 } 1239 }
1337 1240
1338 /* Simple case - coordinates are within this local 1241 /* Simple case - coordinates are within this local
… …
1352maptile * 1255maptile *
1353maptile::xy_find (sint16 &x, sint16 &y) 1256maptile::xy_find (sint16 &x, sint16 &y)
1354{ 1257{
1355 if (x < 0) 1258 if (x < 0)
1356 { 1259 {
1357 if (!tile_path[3]) 1260 if (!tile_available (3))
1358 return 0; 1261 return 0;
1359 1262
1360 find_and_link (this, 3);
1361 x += tile_map[3]->width; 1263 x += tile_map[3]->width;
1362 return tile_map[3]->xy_find (x, y); 1264 return tile_map[3]->xy_find (x, y);
1363 } 1265 }
1364 1266
1365 if (x >= width) 1267 if (x >= width)
1366 { 1268 {
1367 if (!tile_path[1]) 1269 if (!tile_available (1))
1368 return 0; 1270 return 0;
1369 1271
1370 find_and_link (this, 1);
1371 x -= width; 1272 x -= width;
1372 return tile_map[1]->xy_find (x, y); 1273 return tile_map[1]->xy_find (x, y);
1373 } 1274 }
1374 1275
1375 if (y < 0) 1276 if (y < 0)
1376 { 1277 {
1377 if (!tile_path[0]) 1278 if (!tile_available (0))
1378 return 0; 1279 return 0;
1379 1280
1380 find_and_link (this, 0);
1381 y += tile_map[0]->height; 1281 y += tile_map[0]->height;
1382 return tile_map[0]->xy_find (x, y); 1282 return tile_map[0]->xy_find (x, y);
1383 } 1283 }
1384 1284
1385 if (y >= height) 1285 if (y >= height)
1386 { 1286 {
1387 if (!tile_path[2]) 1287 if (!tile_available (2))
1388 return 0; 1288 return 0;
1389 1289
1390 find_and_link (this, 2);
1391 y -= height; 1290 y -= height;
1392 return tile_map[2]->xy_find (x, y); 1291 return tile_map[2]->xy_find (x, y);
1393 } 1292 }
1394 1293
1395 /* Simple case - coordinates are within this local 1294 /* Simple case - coordinates are within this local
… …
1406adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1305adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1407{ 1306{
1408 if (!map1 || !map2) 1307 if (!map1 || !map2)
1409 return 0; 1308 return 0;
1410 1309
1411 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1310 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1412 //fix: compare paths instead (this is likely faster, too!) 1311 //fix: compare paths instead (this is likely faster, too!)
1413 if (map1 == map2) 1312 if (map1 == map2)
1414 { 1313 {
1415 *dx = 0; 1314 *dx = 0;
1416 *dy = 0; 1315 *dy = 0;
… …
1598 else 1497 else
1599 { 1498 {
1600 retval->distance_x += op2->x - x; 1499 retval->distance_x += op2->x - x;
1601 retval->distance_y += op2->y - y; 1500 retval->distance_y += op2->y - y;
1602 1501
1603 retval->part = NULL; 1502 retval->part = 0;
1604 retval->distance = idistance (retval->distance_x, retval->distance_y); 1503 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1605 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1504 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1606 } 1505 }
1607} 1506}
1608 1507
1609/* Returns true of op1 and op2 are effectively on the same map 1508/* Returns true of op1 and op2 are effectively on the same map
… …
1623} 1522}
1624 1523
1625object * 1524object *
1626maptile::insert (object *op, int x, int y, object *originator, int flags) 1525maptile::insert (object *op, int x, int y, object *originator, int flags)
1627{ 1526{
1628 if (!op->flag [FLAG_REMOVED])
1629 op->remove ();
1630
1631 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1527 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1632} 1528}
1633 1529
1634region * 1530region *
1635maptile::region (int x, int y) const 1531maptile::region (int x, int y) const
… …
1645 1541
1646 return ::region::default_region (); 1542 return ::region::default_region ();
1647} 1543}
1648 1544
1649/* picks a random object from a style map. 1545/* 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 */ 1546 */
1653object * 1547object *
1654maptile::pick_random_object () const 1548maptile::pick_random_object (rand_gen &gen) const
1655{ 1549{
1656 /* while returning a null object will result in a crash, that 1550 /* while returning a null object will result in a crash, that
1657 * is actually preferable to an infinite loop. That is because 1551 * is actually preferable to an infinite loop. That is because
1658 * most servers will automatically restart in case of crash. 1552 * most servers will automatically restart in case of crash.
1659 * Change the logic on getting the random space - shouldn't make 1553 * Change the logic on getting the random space - shouldn't make
1660 * any difference, but this seems clearer to me. 1554 * any difference, but this seems clearer to me.
1661 */ 1555 */
1662 for (int i = 1000; --i;) 1556 for (int i = 1000; --i;)
1663 { 1557 {
1664 object *pick = at (rndm (width), rndm (height)).bot; 1558 object *pick = at (gen (width), gen (height)).bot;
1665 1559
1666 // do not prefer big monsters just because they are big. 1560 // do not prefer big monsters just because they are big.
1667 if (pick && pick->head_ () == pick) 1561 if (pick && pick->is_head ())
1668 return pick->head_ (); 1562 return pick->head_ ();
1669 } 1563 }
1670 1564
1671 // instead of crashing in the unlikely(?) case, try to return *something* 1565 // instead of crashing in the unlikely(?) case, try to return *something*
1672 return get_archetype ("blocked"); 1566 return archetype::find ("bug");
1673} 1567}
1674
1675/**
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 1568
1682void 1569void
1683maptile::play_sound (faceidx sound, int x, int y) const 1570maptile::play_sound (faceidx sound, int x, int y) const
1684{ 1571{
1685 if (!sound) 1572 if (!sound)
1686 return; 1573 return;
1687 1574
1575 for_all_players_on_map (pl, this)
1576 if (client *ns = pl->ns)
1577 {
1578 int dx = x - pl->ob->x;
1579 int dy = y - pl->ob->y;
1580
1581 int distance = idistance (dx, dy);
1582
1583 if (distance <= MAX_SOUND_DISTANCE)
1584 ns->play_sound (sound, dx, dy);
1585 }
1586}
1587
1588void
1589maptile::say_msg (const char *msg, int x, int y) const
1590{
1688 for_all_players (pl) 1591 for_all_players (pl)
1689 if (pl->ob->map == this)
1690 if (client *ns = pl->ns) 1592 if (client *ns = pl->ns)
1691 { 1593 {
1692 int dx = x - pl->ob->x; 1594 int dx = x - pl->ob->x;
1693 int dy = y - pl->ob->y; 1595 int dy = y - pl->ob->y;
1694 1596
1695 int distance = idistance (dx, dy); 1597 int distance = idistance (dx, dy);
1696 1598
1697 if (distance <= MAX_SOUND_DISTANCE) 1599 if (distance <= MAX_SOUND_DISTANCE)
1698 ns->play_sound (sound, dx, dy); 1600 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1699 } 1601 }
1700} 1602}
1701 1603
1604static void
1605split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1606{
1607 // clip to map to the left
1608 if (x0 < 0)
1609 {
1610 if (maptile *tile = m->tile_available (TILE_LEFT, 1))
1611 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1612
1613 if (x1 < 0) // entirely to the left
1614 return;
1615
1616 x0 = 0;
1617 }
1618
1619 // clip to map to the right
1620 if (x1 > m->width)
1621 {
1622 if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
1623 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1624
1625 if (x0 > m->width) // entirely to the right
1626 return;
1627
1628 x1 = m->width;
1629 }
1630
1631 // clip to map above
1632 if (y0 < 0)
1633 {
1634 if (maptile *tile = m->tile_available (TILE_UP, 1))
1635 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1636
1637 if (y1 < 0) // entirely above
1638 return;
1639
1640 y0 = 0;
1641 }
1642
1643 // clip to map below
1644 if (y1 > m->height)
1645 {
1646 if (maptile *tile = m->tile_available (TILE_DOWN, 1))
1647 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1648
1649 if (y0 > m->height) // entirely below
1650 return;
1651
1652 y1 = m->height;
1653 }
1654
1655 // if we get here, the rect is within the current map
1656 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1657
1658 r->m = m;
1659 r->x0 = x0;
1660 r->y0 = y0;
1661 r->x1 = x1;
1662 r->y1 = y1;
1663 r->dx = dx;
1664 r->dy = dy;
1665}
1666
1667maprect *
1668maptile::split_to_tiles (int x0, int y0, int x1, int y1)
1669{
1670 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1671 buf.clear ();
1672
1673 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1674
1675 // add end marker
1676 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1677 r->m = 0;
1678
1679 return (maprect *)buf.linearise ();
1680}
1681

Diff Legend

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