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.117 by root, Fri Aug 24 00:26:09 2007 UTC vs.
Revision 1.169 by root, Sat Nov 7 18:30:05 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
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
… …
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, "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.bot; tmp; tmp = tmp->above)
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 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 151
158 if (tmp->flag [FLAG_ALIVE] 152 if (tmp->flag [FLAG_ALIVE]
159 && tmp->head_ () != ob 153 && tmp->head_ () != ob
160 && tmp != ob 154 && tmp != ob
161 && tmp->type != DOOR 155 && tmp->type != DOOR
162 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden)) 156 && !tmp->flag [FLAG_WIZPASS])
163 return 1; 157 return 1;
164 } 158 }
165
166 } 159 }
160
167 return 0; 161 return 0;
168} 162}
169 163
170/* 164/*
171 * Returns true if the given object can't fit in the given spot. 165 * 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, 166 * spot. This is meant for multi space objects - for single space objecs,
173 * just calling get_map_blocked and checking that against movement type 167 * just calling get_map_blocked and checking that against movement type
174 * of object. This function goes through all the parts of the 168 * of object. This function goes through all the parts of the multipart
175 * multipart object and makes sure they can be inserted. 169 * object and makes sure they can be inserted.
176 * 170 *
177 * While this doesn't call out of map, the get_map_flags does. 171 * While this doesn't call out of map, the get_map_flags does.
178 * 172 *
179 * This function has been used to deprecate arch_out_of_map - 173 * This function has been used to deprecate arch_out_of_map -
180 * this function also does that check, and since in most cases, 174 * this function also does that check, and since in most cases,
… …
191 * 185 *
192 * Note this used to be arch_blocked, but with new movement 186 * Note this used to be arch_blocked, but with new movement
193 * code, we need to have actual object to check its move_type 187 * code, we need to have actual object to check its move_type
194 * against the move_block values. 188 * against the move_block values.
195 */ 189 */
196int 190bool
197ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 191object::blocked (maptile *m, int x, int y) const
198{ 192{
199 archetype *tmp; 193 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 } 194 {
195 mapxy pos (m, x + tmp->x, y + tmp->y);
213 196
214 for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more) 197 if (!pos.normalise ())
215 { 198 return 1;
216 flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
217 199
218 if (flag & P_OUT_OF_MAP) 200 mapspace &ms = *pos;
219 return P_OUT_OF_MAP; 201
220 if (flag & P_IS_ALIVE) 202 if (ms.flags () & P_IS_ALIVE)
221 return P_IS_ALIVE; 203 return 1;
222 204
223 mapspace &ms = m1->at (sx, sy); 205 /* However, often ob doesn't have any move type
224 206 * (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. 207 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
228 */ 208 */
229
230 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 209 if (!move_type && ms.move_block != MOVE_ALL)
231 continue; 210 continue;
232 211
233 /* Note it is intentional that we check ob - the movement type of the 212 /* Note it is intentional that we check ob - the movement type of the
234 * head of the object should correspond for the entire object. 213 * head of the object should correspond for the entire object.
235 */ 214 */
236 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 215 if (ms.blocks (move_type))
237 return P_NO_PASS; 216 return 1;
238 } 217 }
239 218
240 return 0; 219 return 0;
241} 220}
242 221
… …
244 * into inventory, but just links them. What this does is go through 223 * into inventory, but just links them. What this does is go through
245 * and insert them properly. 224 * and insert them properly.
246 * The object 'container' is the object that contains the inventory. 225 * The object 'container' is the object that contains the inventory.
247 * This is needed so that we can update the containers weight. 226 * This is needed so that we can update the containers weight.
248 */ 227 */
249void 228static void
250fix_container (object *container) 229fix_container (object *container)
251{ 230{
252 object *tmp = container->inv, *next; 231 object *tmp = container->inv, *next;
253 232
254 container->inv = 0; 233 container->inv = 0;
… …
260 239
261 insert_ob_in_ob (tmp, container); 240 insert_ob_in_ob (tmp, container);
262 tmp = next; 241 tmp = next;
263 } 242 }
264 243
265 /* sum_weight will go through and calculate what all the containers are 244 // go through and calculate what all the containers are carrying.
266 * carrying. 245 //TODO: remove
267 */ 246 container->update_weight ();
268 sum_weight (container);
269} 247}
248
249//-GPL
270 250
271void 251void
272maptile::set_object_flag (int flag, int value) 252maptile::set_object_flag (int flag, int value)
273{ 253{
274 if (!spaces) 254 if (!spaces)
… …
276 256
277 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 257 for (mapspace *ms = spaces + size (); ms-- > spaces; )
278 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 258 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
279 tmp->flag [flag] = value; 259 tmp->flag [flag] = value;
280} 260}
261
262void
263maptile::post_load_original ()
264{
265 if (!spaces)
266 return;
267
268 set_object_flag (FLAG_OBJ_ORIGINAL);
269
270 for (mapspace *ms = spaces + size (); ms-- > spaces; )
271 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
272 INVOKE_OBJECT (RESET, tmp);
273}
274
275//+GPL
281 276
282/* link_multipart_objects go through all the objects on the map looking 277/* 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 278 * 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 279 * info we have, they only have the head (as would be expected when
285 * they are saved). 280 * they are saved).
… …
313 op = op->above; 308 op = op->above;
314 } 309 }
315 } 310 }
316} 311}
317 312
313//-GPL
314
318/* 315/*
319 * Loads (ands parses) the objects into a given map from the specified 316 * Loads (ands parses) the objects into a given map from the specified
320 * file pointer. 317 * file pointer.
321 */ 318 */
322bool 319bool
323maptile::_load_objects (object_thawer &f) 320maptile::_load_objects (object_thawer &f)
324{ 321{
325 for (;;) 322 for (;;)
326 { 323 {
327 coroapi::cede_to_tick_every (100); // cede once in a while 324 coroapi::cede_to_tick (); // cede once in a while
328 325
329 switch (f.kw) 326 switch (f.kw)
330 { 327 {
331 case KW_arch: 328 case KW_arch:
332 if (object *op = object::read (f, this)) 329 if (object *op = object::read (f, this))
333 { 330 {
331 // TODO: why?
334 if (op->inv) 332 if (op->inv)
335 sum_weight (op); 333 op->update_weight ();
336 334
337 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 335 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
336 {
337 // we insert manually because
338 // a) its way faster
339 // b) we remove manually, too, and there are good reasons for that
340 // c) it's correct
341 mapspace &ms = at (op->x, op->y);
342
343 op->flag [FLAG_REMOVED] = false;
344
345 op->above = 0;
346 op->below = ms.top;
347
348 *(ms.top ? &ms.top->above : &ms.bot) = op;
349
350 ms.top = op;
351 ms.flags_ = 0;
352 }
353 else
354 {
355 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
356 op->destroy ();
357 }
338 } 358 }
339 359
340 continue; 360 continue;
341 361
342 case KW_EOF: 362 case KW_EOF:
… …
383 if (!spaces) 403 if (!spaces)
384 return false; 404 return false;
385 405
386 for (int i = 0; i < size (); ++i) 406 for (int i = 0; i < size (); ++i)
387 { 407 {
388 int unique = 0; 408 bool unique = 0;
409
389 for (object *op = spaces [i].bot; op; op = op->above) 410 for (object *op = spaces [i].bot; op; op = op->above)
390 { 411 {
391 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 412 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
392 unique = 1;
393 413
394 if (!op->can_map_save ()) 414 if (expect_false (!op->can_map_save ()))
395 continue; 415 continue;
396 416
397 if (unique || op->flag [FLAG_UNIQUE]) 417 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
398 { 418 {
399 if (flags & IO_UNIQUES) 419 if (flags & IO_UNIQUES)
400 op->write (f); 420 op->write (f);
401 } 421 }
402 else if (flags & IO_OBJECTS) 422 else if (expect_true (flags & IO_OBJECTS))
403 op->write (f); 423 op->write (f);
404 } 424 }
405 } 425 }
406 426
407 coroapi::cede_to_tick (); 427 coroapi::cede_to_tick ();
408 428
409 return true; 429 return true;
410}
411
412bool
413maptile::_load_objects (const char *path, bool skip_header)
414{
415 object_thawer f (path);
416
417 if (!f)
418 return false;
419
420 f.next ();
421
422 if (skip_header)
423 for (;;)
424 {
425 keyword kw = f.kw;
426 f.skip ();
427 if (kw == KW_end)
428 break;
429 }
430
431 return _load_objects (f);
432} 430}
433 431
434bool 432bool
435maptile::_save_objects (const char *path, int flags) 433maptile::_save_objects (const char *path, int flags)
436{ 434{
… …
481 if (spaces) 479 if (spaces)
482 return; 480 return;
483 481
484 spaces = salloc0<mapspace> (size ()); 482 spaces = salloc0<mapspace> (size ());
485} 483}
484
485//+GPL
486 486
487/* Takes a string from a map definition and outputs a pointer to the array of shopitems 487/* Takes a string from a map definition and outputs a pointer to the array of shopitems
488 * corresponding to that string. Memory is allocated for this, it must be freed 488 * corresponding to that string. Memory is allocated for this, it must be freed
489 * at a later date. 489 * at a later date.
490 * Called by parse_map_headers below. 490 * Called by parse_map_headers below.
… …
567 return items; 567 return items;
568} 568}
569 569
570/* opposite of parse string, this puts the string that was originally fed in to 570/* opposite of parse string, this puts the string that was originally fed in to
571 * the map (or something equivilent) into output_string. */ 571 * the map (or something equivilent) into output_string. */
572static void 572static const char *
573print_shop_string (maptile *m, char *output_string) 573print_shop_string (maptile *m)
574{ 574{
575 int i; 575 static dynbuf_text buf; buf.clear ();
576 char tmp[MAX_BUF];
577 576
578 strcpy (output_string, "");
579 for (i = 0; i < m->shopitems[0].index; i++) 577 for (int i = 0; i < m->shopitems[0].index; i++)
580 { 578 {
581 if (m->shopitems[i].typenum) 579 if (m->shopitems[i].typenum)
582 { 580 {
583 if (m->shopitems[i].strength) 581 if (m->shopitems[i].strength)
584 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 582 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
585 else 583 else
586 sprintf (tmp, "%s;", m->shopitems[i].name); 584 buf.printf ("%s;", m->shopitems[i].name);
587 } 585 }
588 else 586 else
589 { 587 {
590 if (m->shopitems[i].strength) 588 if (m->shopitems[i].strength)
591 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 589 buf.printf ("*:%d;", m->shopitems[i].strength);
592 else 590 else
593 sprintf (tmp, "*"); 591 buf.printf ("*");
594 } 592 }
595
596 strcat (output_string, tmp);
597 } 593 }
594
595 return buf;
598} 596}
597
598//-GPL
599 599
600/* This loads the header information of the map. The header 600/* This loads the header information of the map. The header
601 * contains things like difficulty, size, timeout, etc. 601 * contains things like difficulty, size, timeout, etc.
602 * this used to be stored in the map object, but with the 602 * this used to be stored in the map object, but with the
603 * addition of tiling, fields beyond that easily named in an 603 * addition of tiling, fields beyond that easily named in an
… …
611bool 611bool
612maptile::_load_header (object_thawer &thawer) 612maptile::_load_header (object_thawer &thawer)
613{ 613{
614 for (;;) 614 for (;;)
615 { 615 {
616 thawer.next ();
617
618 switch (thawer.kw) 616 switch (thawer.kw)
619 { 617 {
620 case KW_msg: 618 case KW_msg:
621 thawer.get_ml (KW_endmsg, msg); 619 thawer.get_ml (KW_endmsg, msg);
622 break; 620 break;
… …
656 case KW_sky: thawer.get (sky); break; 654 case KW_sky: thawer.get (sky); break;
657 655
658 case KW_per_player: thawer.get (per_player); break; 656 case KW_per_player: thawer.get (per_player); break;
659 case KW_per_party: thawer.get (per_party); break; 657 case KW_per_party: thawer.get (per_party); break;
660 case KW_no_reset: thawer.get (no_reset); break; 658 case KW_no_reset: thawer.get (no_reset); break;
659 case KW_no_drop: thawer.get (no_drop); break;
661 660
662 case KW_region: default_region = region::find (thawer.get_str ()); break; 661 case KW_region: default_region = region::find (thawer.get_str ()); break;
663 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 662 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
664 663
665 // old names new names 664 // old names new names
… …
677 case KW_tile_path_2: thawer.get (tile_path [1]); break; 676 case KW_tile_path_2: thawer.get (tile_path [1]); break;
678 case KW_tile_path_3: thawer.get (tile_path [2]); break; 677 case KW_tile_path_3: thawer.get (tile_path [2]); break;
679 case KW_tile_path_4: thawer.get (tile_path [3]); break; 678 case KW_tile_path_4: thawer.get (tile_path [3]); break;
680 679
681 case KW_ERROR: 680 case KW_ERROR:
682 set_key (thawer.kw_str, thawer.value); 681 set_key_text (thawer.kw_str, thawer.value);
683 break; 682 break;
684 683
685 case KW_end: 684 case KW_end:
685 thawer.next ();
686 return true; 686 return true;
687 687
688 default: 688 default:
689 if (!thawer.parse_error ("map", 0)) 689 if (!thawer.parse_error ("map", 0))
690 return false; 690 return false;
691 break; 691 break;
692 } 692 }
693
694 thawer.next ();
693 } 695 }
694 696
695 abort (); 697 abort ();
696} 698}
697 699
698bool 700//+GPL
699maptile::_load_header (const char *path)
700{
701 object_thawer thawer (path);
702
703 if (!thawer)
704 return false;
705
706 return _load_header (thawer);
707}
708 701
709/****************************************************************************** 702/******************************************************************************
710 * This is the start of unique map handling code 703 * This is the start of unique map handling code
711 *****************************************************************************/ 704 *****************************************************************************/
712 705
… …
723 716
724 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 717 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
725 unique = 1; 718 unique = 1;
726 719
727 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 720 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
728 {
729 op->destroy_inv (false);
730 op->destroy (); 721 op->destroy ();
731 }
732 722
733 op = above; 723 op = above;
734 } 724 }
735 } 725 }
736} 726}
727
728//-GPL
737 729
738bool 730bool
739maptile::_save_header (object_freezer &freezer) 731maptile::_save_header (object_freezer &freezer)
740{ 732{
741#define MAP_OUT(k) freezer.put (KW_ ## k, k) 733#define MAP_OUT(k) freezer.put (KW_ ## k, k)
… …
747 MAP_OUT (swap_time); 739 MAP_OUT (swap_time);
748 MAP_OUT (reset_time); 740 MAP_OUT (reset_time);
749 MAP_OUT (reset_timeout); 741 MAP_OUT (reset_timeout);
750 MAP_OUT (fixed_resettime); 742 MAP_OUT (fixed_resettime);
751 MAP_OUT (no_reset); 743 MAP_OUT (no_reset);
744 MAP_OUT (no_drop);
752 MAP_OUT (difficulty); 745 MAP_OUT (difficulty);
753
754 if (default_region) MAP_OUT2 (region, default_region->name); 746 if (default_region) MAP_OUT2 (region, default_region->name);
755 747
756 if (shopitems) 748 if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
757 {
758 char shop[MAX_BUF];
759 print_shop_string (this, shop);
760 MAP_OUT2 (shopitems, shop);
761 }
762
763 MAP_OUT (shopgreed); 749 MAP_OUT (shopgreed);
764 MAP_OUT (shopmin); 750 MAP_OUT (shopmin);
765 MAP_OUT (shopmax); 751 MAP_OUT (shopmax);
766 if (shoprace) MAP_OUT (shoprace); 752 if (shoprace) MAP_OUT (shoprace);
753
767 MAP_OUT (darkness); 754 MAP_OUT (darkness);
768 MAP_OUT (width); 755 MAP_OUT (width);
769 MAP_OUT (height); 756 MAP_OUT (height);
770 MAP_OUT (enter_x); 757 MAP_OUT (enter_x);
771 MAP_OUT (enter_y); 758 MAP_OUT (enter_y);
… …
804 return false; 791 return false;
805 792
806 return freezer.save (path); 793 return freezer.save (path);
807} 794}
808 795
796//+GPL
797
809/* 798/*
810 * Remove and free all objects in the given map. 799 * Remove and free all objects in the given map.
811 */ 800 */
812void 801void
813maptile::clear () 802maptile::clear ()
814{ 803{
815 sfree (regions, size ()); regions = 0;
816 delete [] regionmap; regionmap = 0;
817
818 if (spaces) 804 if (spaces)
819 { 805 {
820 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 806 for (mapspace *ms = spaces + size (); ms-- > spaces; )
821 while (object *op = ms->bot) 807 while (object *op = ms->bot)
822 { 808 {
809 // manually remove, as to not trigger anything
810 if (ms->bot = op->above)
811 ms->bot->below = 0;
812
813 op->flag [FLAG_REMOVED] = true;
814
823 op = op->head_ (); 815 object *head = op->head_ ();
824 op->destroy_inv (false); 816 if (op == head)
825 op->destroy (); 817 op->destroy ();
818 else if (head->map != op->map)
819 {
820 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
821 head->destroy ();
822 }
826 } 823 }
827 824
828 sfree (spaces, size ()), spaces = 0; 825 sfree0 (spaces, size ());
829 } 826 }
830 827
831 if (buttons) 828 if (buttons)
832 free_objectlinkpt (buttons), buttons = 0; 829 free_objectlinkpt (buttons), buttons = 0;
830
831 sfree0 (regions, size ());
832 delete [] regionmap; regionmap = 0;
833} 833}
834 834
835void 835void
836maptile::clear_header () 836maptile::clear_header ()
837{ 837{
… …
889 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 889 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
890 break; 890 break;
891 891
892 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 892 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
893 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 893 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
894 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
895 || QUERY_FLAG (op, FLAG_UNIQUE) 894 || QUERY_FLAG (op, FLAG_UNIQUE)
896 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 895 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
897 || QUERY_FLAG (op, FLAG_UNPAID) 896 || QUERY_FLAG (op, FLAG_UNPAID)
898 || op->is_alive ()) 897 || op->is_alive ())
899 ; // do not decay 898 ; // do not decay
… …
938 op->destroy (); 937 op->destroy ();
939 } 938 }
940} 939}
941 940
942/* 941/*
943 * Updates every button on the map (by calling update_button() for them).
944 */
945void
946maptile::update_buttons ()
947{
948 for (oblinkpt *obp = buttons; obp; obp = obp->next)
949 for (objectlink *ol = obp->link; ol; ol = ol->next)
950 {
951 if (!ol->ob)
952 {
953 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
954 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
955 continue;
956 }
957
958 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
959 {
960 update_button (ol->ob);
961 break;
962 }
963 }
964}
965
966/*
967 * This routine is supposed to find out the difficulty of the map. 942 * This routine is supposed to find out the difficulty of the map.
968 * difficulty does not have a lot to do with character level, 943 * difficulty does not have a lot to do with character level,
969 * but does have a lot to do with treasure on the map. 944 * but does have a lot to do with treasure on the map.
970 * 945 *
971 * Difficulty can now be set by the map creature. If the value stored 946 * Difficulty can now be set by the map creator. If the value stored
972 * in the map is zero, then use this routine. Maps should really 947 * in the map is zero, then use this routine. Maps should really
973 * have a difficulty set than using this function - human calculation 948 * have a difficulty set rather than using this function - human calculation
974 * is much better than this functions guesswork. 949 * is much better than this function's guesswork.
975 */ 950 */
976int 951int
977maptile::estimate_difficulty () const 952maptile::estimate_difficulty () const
978{ 953{
979 long monster_cnt = 0; 954 long monster_cnt = 0;
… …
991 966
992 if (QUERY_FLAG (op, FLAG_GENERATOR)) 967 if (QUERY_FLAG (op, FLAG_GENERATOR))
993 { 968 {
994 total_exp += op->stats.exp; 969 total_exp += op->stats.exp;
995 970
996 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 971 if (archetype *at = op->other_arch)
972 {
997 total_exp += at->stats.exp * 8; 973 total_exp += at->stats.exp * 8;
998
999 monster_cnt++; 974 monster_cnt++;
975 }
976
977 for (object *inv = op->inv; inv; inv = inv->below)
978 {
979 total_exp += op->stats.exp * 8;
980 monster_cnt++;
981 }
1000 } 982 }
1001 } 983 }
1002 984
1003 avgexp = (double) total_exp / monster_cnt; 985 avgexp = (double) total_exp / monster_cnt;
1004 986
… …
1017 * postive values make it darker, negative make it brighter 999 * postive values make it darker, negative make it brighter
1018 */ 1000 */
1019int 1001int
1020maptile::change_map_light (int change) 1002maptile::change_map_light (int change)
1021{ 1003{
1022 int new_level = darkness + change;
1023
1024 /* Nothing to do */ 1004 /* Nothing to do */
1025 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 1005 if (!change)
1026 return 0; 1006 return 0;
1027 1007
1028 /* inform all players on the map */ 1008 /* inform all players on the map */
1029 if (change > 0) 1009 if (change > 0)
1030 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 1010 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1031 else 1011 else
1032 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 1012 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1033 1013
1034 /* Do extra checking. since darkness is a unsigned value, 1014 darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1035 * we need to be extra careful about negative values.
1036 * In general, the checks below are only needed if change
1037 * is not +/-1
1038 */
1039 if (new_level < 0)
1040 darkness = 0;
1041 else if (new_level >= MAX_DARKNESS)
1042 darkness = MAX_DARKNESS;
1043 else
1044 darkness = new_level;
1045 1015
1046 /* All clients need to get re-updated for the change */ 1016 /* All clients need to get re-updated for the change */
1047 update_all_map_los (this); 1017 update_all_map_los (this);
1018
1048 return 1; 1019 return 1;
1049} 1020}
1050 1021
1051/* 1022/*
1052 * This function updates various attributes about a specific space 1023 * This function updates various attributes about a specific space
… …
1055 * through, etc) 1026 * through, etc)
1056 */ 1027 */
1057void 1028void
1058mapspace::update_ () 1029mapspace::update_ ()
1059{ 1030{
1060 object *tmp, *last = 0; 1031 object *last = 0;
1061 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1032 uint8 flags = P_UPTODATE, anywhere = 0;
1033 sint8 light = 0;
1062 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1034 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1063 1035
1064 //object *middle = 0; 1036 //object *middle = 0;
1065 //object *top = 0; 1037 //object *top = 0;
1066 //object *floor = 0; 1038 //object *floor = 0;
1067 // this seems to generate better code than using locals, above 1039 // this seems to generate better code than using locals, above
1068 object *&top = faces_obj[0] = 0; 1040 object *&top = faces_obj[0] = 0;
1069 object *&middle = faces_obj[1] = 0; 1041 object *&middle = faces_obj[1] = 0;
1070 object *&floor = faces_obj[2] = 0; 1042 object *&floor = faces_obj[2] = 0;
1071 1043
1072 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1044 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1073 { 1045 {
1074 /* This could be made additive I guess (two lights better than 1046 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1075 * one). But if so, it shouldn't be a simple additive - 2
1076 * light bulbs do not illuminate twice as far as once since
1077 * it is a dissapation factor that is cubed.
1078 */
1079 if (tmp->glow_radius > light)
1080 light = tmp->glow_radius; 1047 light += tmp->glow_radius;
1081 1048
1082 /* This call is needed in order to update objects the player 1049 /* This call is needed in order to update objects the player
1083 * is standing in that have animations (ie, grass, fire, etc). 1050 * is standing in that have animations (ie, grass, fire, etc).
1084 * However, it also causes the look window to be re-drawn 1051 * However, it also causes the look window to be re-drawn
1085 * 3 times each time the player moves, because many of the 1052 * 3 times each time the player moves, because many of the
… …
1104 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1071 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1105 { 1072 {
1106 middle = tmp; 1073 middle = tmp;
1107 anywhere = 1; 1074 anywhere = 1;
1108 } 1075 }
1076
1109 /* Find the highest visible face around. If equal 1077 /* Find the highest visible face around. If equal
1110 * visibilities, we still want the one nearer to the 1078 * visibilities, we still want the one nearer to the
1111 * top 1079 * top
1112 */ 1080 */
1113 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere)) 1081 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
… …
1132 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1100 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1133 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE; 1101 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1134 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC; 1102 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1135 } 1103 }
1136 1104
1137 this->light = light; 1105 this->light = min (light, MAX_LIGHT_RADIUS);
1138 this->flags_ = flags; 1106 this->flags_ = flags;
1139 this->move_block = move_block & ~move_allow; 1107 this->move_block = move_block & ~move_allow;
1140 this->move_on = move_on; 1108 this->move_on = move_on;
1141 this->move_off = move_off; 1109 this->move_off = move_off;
1142 this->move_slow = move_slow; 1110 this->move_slow = move_slow;
… …
1162 * 1) top face is set, need middle to be set. 1130 * 1) top face is set, need middle to be set.
1163 * 2) middle is set, need to set top. 1131 * 2) middle is set, need to set top.
1164 * 3) neither middle or top is set - need to set both. 1132 * 3) neither middle or top is set - need to set both.
1165 */ 1133 */
1166 1134
1167 for (tmp = last; tmp; tmp = tmp->below) 1135 for (object *tmp = last; tmp; tmp = tmp->below)
1168 { 1136 {
1169 /* Once we get to a floor, stop, since we already have a floor object */ 1137 /* Once we get to a floor, stop, since we already have a floor object */
1170 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1138 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1171 break; 1139 break;
1172 1140
… …
1224 vol += op->volume (); 1192 vol += op->volume ();
1225 1193
1226 return vol; 1194 return vol;
1227} 1195}
1228 1196
1229bool 1197maptile *
1230maptile::tile_available (int dir, bool load) 1198maptile::tile_available (int dir, bool load)
1231{ 1199{
1232 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY))
1233 return 1;
1234
1235 if (!tile_path[dir]) 1200 if (tile_path[dir])
1236 return 0; 1201 {
1202 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1203 return tile_map[dir];
1237 1204
1238 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1205 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1239 return 1; 1206 return tile_map[dir];
1207 }
1240 1208
1241 return 0; 1209 return 0;
1242} 1210}
1243 1211
1244/* this returns TRUE if the coordinates (x,y) are out of 1212/* this returns TRUE if the coordinates (x,y) are out of
… …
1259 if (!m) 1227 if (!m)
1260 return 0; 1228 return 0;
1261 1229
1262 if (x < 0) 1230 if (x < 0)
1263 { 1231 {
1264 if (!m->tile_available (3, 0)) 1232 if (!m->tile_available (3))
1265 return 1; 1233 return 1;
1266 1234
1267 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1235 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1268 } 1236 }
1269 1237
1270 if (x >= m->width) 1238 if (x >= m->width)
1271 { 1239 {
1272 if (!m->tile_available (1, 0)) 1240 if (!m->tile_available (1))
1273 return 1; 1241 return 1;
1274 1242
1275 return out_of_map (m->tile_map[1], x - m->width, y); 1243 return out_of_map (m->tile_map[1], x - m->width, y);
1276 } 1244 }
1277 1245
1278 if (y < 0) 1246 if (y < 0)
1279 { 1247 {
1280 if (!m->tile_available (0, 0)) 1248 if (!m->tile_available (0))
1281 return 1; 1249 return 1;
1282 1250
1283 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1251 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1284 } 1252 }
1285 1253
1286 if (y >= m->height) 1254 if (y >= m->height)
1287 { 1255 {
1288 if (!m->tile_available (2, 0)) 1256 if (!m->tile_available (2))
1289 return 1; 1257 return 1;
1290 1258
1291 return out_of_map (m->tile_map[2], x, y - m->height); 1259 return out_of_map (m->tile_map[2], x, y - m->height);
1292 } 1260 }
1293 1261
… …
1308maptile * 1276maptile *
1309maptile::xy_find (sint16 &x, sint16 &y) 1277maptile::xy_find (sint16 &x, sint16 &y)
1310{ 1278{
1311 if (x < 0) 1279 if (x < 0)
1312 { 1280 {
1313 if (!tile_available (3, 1)) 1281 if (!tile_available (3))
1314 return 0; 1282 return 0;
1315 1283
1316 x += tile_map[3]->width; 1284 x += tile_map[3]->width;
1317 return tile_map[3]->xy_find (x, y); 1285 return tile_map[3]->xy_find (x, y);
1318 } 1286 }
1319 1287
1320 if (x >= width) 1288 if (x >= width)
1321 { 1289 {
1322 if (!tile_available (1, 1)) 1290 if (!tile_available (1))
1323 return 0; 1291 return 0;
1324 1292
1325 x -= width; 1293 x -= width;
1326 return tile_map[1]->xy_find (x, y); 1294 return tile_map[1]->xy_find (x, y);
1327 } 1295 }
1328 1296
1329 if (y < 0) 1297 if (y < 0)
1330 { 1298 {
1331 if (!tile_available (0, 1)) 1299 if (!tile_available (0))
1332 return 0; 1300 return 0;
1333 1301
1334 y += tile_map[0]->height; 1302 y += tile_map[0]->height;
1335 return tile_map[0]->xy_find (x, y); 1303 return tile_map[0]->xy_find (x, y);
1336 } 1304 }
1337 1305
1338 if (y >= height) 1306 if (y >= height)
1339 { 1307 {
1340 if (!tile_available (2, 1)) 1308 if (!tile_available (2))
1341 return 0; 1309 return 0;
1342 1310
1343 y -= height; 1311 y -= height;
1344 return tile_map[2]->xy_find (x, y); 1312 return tile_map[2]->xy_find (x, y);
1345 } 1313 }
… …
1358adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1326adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1359{ 1327{
1360 if (!map1 || !map2) 1328 if (!map1 || !map2)
1361 return 0; 1329 return 0;
1362 1330
1363 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1331 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1364 //fix: compare paths instead (this is likely faster, too!) 1332 //fix: compare paths instead (this is likely faster, too!)
1365 if (map1 == map2) 1333 if (map1 == map2)
1366 { 1334 {
1367 *dx = 0; 1335 *dx = 0;
1368 *dy = 0; 1336 *dy = 0;
… …
1550 else 1518 else
1551 { 1519 {
1552 retval->distance_x += op2->x - x; 1520 retval->distance_x += op2->x - x;
1553 retval->distance_y += op2->y - y; 1521 retval->distance_y += op2->y - y;
1554 1522
1555 retval->part = NULL; 1523 retval->part = 0;
1556 retval->distance = idistance (retval->distance_x, retval->distance_y); 1524 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1557 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1525 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1558 } 1526 }
1559} 1527}
1560 1528
1561/* Returns true of op1 and op2 are effectively on the same map 1529/* Returns true of op1 and op2 are effectively on the same map
… …
1572 int dx, dy; 1540 int dx, dy;
1573 1541
1574 return adjacent_map (op1->map, op2->map, &dx, &dy); 1542 return adjacent_map (op1->map, op2->map, &dx, &dy);
1575} 1543}
1576 1544
1545//-GPL
1546
1577object * 1547object *
1578maptile::insert (object *op, int x, int y, object *originator, int flags) 1548maptile::insert (object *op, int x, int y, object *originator, int flags)
1579{ 1549{
1580 if (!op->flag [FLAG_REMOVED])
1581 op->remove ();
1582
1583 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1550 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1584} 1551}
1585 1552
1586region * 1553region *
1587maptile::region (int x, int y) const 1554maptile::region (int x, int y) const
… …
1596 return default_region; 1563 return default_region;
1597 1564
1598 return ::region::default_region (); 1565 return ::region::default_region ();
1599} 1566}
1600 1567
1568//+GPL
1569
1601/* picks a random object from a style map. 1570/* picks a random object from a style map.
1602 * Redone by MSW so it should be faster and not use static
1603 * variables to generate tables.
1604 */ 1571 */
1605object * 1572object *
1606maptile::pick_random_object () const 1573maptile::pick_random_object (rand_gen &gen) const
1607{ 1574{
1608 /* while returning a null object will result in a crash, that 1575 /* while returning a null object will result in a crash, that
1609 * is actually preferable to an infinite loop. That is because 1576 * is actually preferable to an infinite loop. That is because
1610 * most servers will automatically restart in case of crash. 1577 * most servers will automatically restart in case of crash.
1611 * Change the logic on getting the random space - shouldn't make 1578 * Change the logic on getting the random space - shouldn't make
1612 * any difference, but this seems clearer to me. 1579 * any difference, but this seems clearer to me.
1613 */ 1580 */
1614 for (int i = 1000; --i;) 1581 for (int i = 1000; --i;)
1615 { 1582 {
1616 object *pick = at (rndm (width), rndm (height)).bot; 1583 object *pick = at (gen (width), gen (height)).bot;
1617 1584
1618 // do not prefer big monsters just because they are big. 1585 // do not prefer big monsters just because they are big.
1619 if (pick && pick->head_ () == pick) 1586 if (pick && pick->is_head ())
1620 return pick->head_ (); 1587 return pick->head_ ();
1621 } 1588 }
1622 1589
1623 // instead of crashing in the unlikely(?) case, try to return *something* 1590 // instead of crashing in the unlikely(?) case, try to return *something*
1624 return get_archetype ("blocked"); 1591 return archetype::find (shstr_bug);
1625} 1592}
1593
1594//-GPL
1626 1595
1627void 1596void
1628maptile::play_sound (faceidx sound, int x, int y) const 1597maptile::play_sound (faceidx sound, int x, int y) const
1629{ 1598{
1630 if (!sound) 1599 if (!sound)
1631 return; 1600 return;
1632 1601
1602 for_all_players_on_map (pl, this)
1603 if (client *ns = pl->ns)
1604 {
1605 int dx = x - pl->ob->x;
1606 int dy = y - pl->ob->y;
1607
1608 int distance = idistance (dx, dy);
1609
1610 if (distance <= MAX_SOUND_DISTANCE)
1611 ns->play_sound (sound, dx, dy);
1612 }
1613}
1614
1615void
1616maptile::say_msg (const char *msg, int x, int y) const
1617{
1633 for_all_players (pl) 1618 for_all_players (pl)
1634 if (pl->ob->map == this)
1635 if (client *ns = pl->ns) 1619 if (client *ns = pl->ns)
1636 { 1620 {
1637 int dx = x - pl->ob->x; 1621 int dx = x - pl->ob->x;
1638 int dy = y - pl->ob->y; 1622 int dy = y - pl->ob->y;
1639 1623
1640 int distance = idistance (dx, dy); 1624 int distance = idistance (dx, dy);
1641 1625
1642 if (distance <= MAX_SOUND_DISTANCE) 1626 if (distance <= MAX_SOUND_DISTANCE)
1643 ns->play_sound (sound, dx, dy); 1627 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1644 } 1628 }
1645} 1629}
1646 1630
1631static void
1632split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1633{
1634 // clip to map to the left
1635 if (x0 < 0)
1636 {
1637 if (maptile *tile = m->tile_available (TILE_LEFT, 1))
1638 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1639
1640 if (x1 < 0) // entirely to the left
1641 return;
1642
1643 x0 = 0;
1644 }
1645
1646 // clip to map to the right
1647 if (x1 > m->width)
1648 {
1649 if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
1650 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1651
1652 if (x0 > m->width) // entirely to the right
1653 return;
1654
1655 x1 = m->width;
1656 }
1657
1658 // clip to map above
1659 if (y0 < 0)
1660 {
1661 if (maptile *tile = m->tile_available (TILE_UP, 1))
1662 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1663
1664 if (y1 < 0) // entirely above
1665 return;
1666
1667 y0 = 0;
1668 }
1669
1670 // clip to map below
1671 if (y1 > m->height)
1672 {
1673 if (maptile *tile = m->tile_available (TILE_DOWN, 1))
1674 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1675
1676 if (y0 > m->height) // entirely below
1677 return;
1678
1679 y1 = m->height;
1680 }
1681
1682 // if we get here, the rect is within the current map
1683 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1684
1685 r->m = m;
1686 r->x0 = x0;
1687 r->y0 = y0;
1688 r->x1 = x1;
1689 r->y1 = y1;
1690 r->dx = dx;
1691 r->dy = dy;
1692}
1693
1694maprect *
1695maptile::split_to_tiles (int x0, int y0, int x1, int y1)
1696{
1697 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1698 buf.clear ();
1699
1700 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1701
1702 // add end marker
1703 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1704 r->m = 0;
1705
1706 return (maprect *)buf.linearise ();
1707}
1708

Diff Legend

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