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.156 by root, Thu Jan 8 03:03:23 2009 UTC vs.
Revision 1.167 by root, Thu Nov 5 15:43:21 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra 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 <support@deliantra.net> 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 "loader.h" 28#include "loader.h"
28#include "path.h" 29#include "path.h"
30
31//+GPL
29 32
30sint8 maptile::outdoor_darkness; 33sint8 maptile::outdoor_darkness;
31 34
32/* This rolls up wall, blocks_magic, blocks_view, etc, all into 35/* This rolls up wall, blocks_magic, blocks_view, etc, all into
33 * one function that just returns a P_.. value (see map.h) 36 * one function that just returns a P_.. value (see map.h)
… …
70 * by the caller. 73 * by the caller.
71 */ 74 */
72int 75int
73blocked_link (object *ob, maptile *m, int sx, int sy) 76blocked_link (object *ob, maptile *m, int sx, int sy)
74{ 77{
75 object *tmp;
76 int mflags, blocked;
77
78 /* 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
79 * have already checked this. 79 * have already checked this.
80 */ 80 */
81 if (OUT_OF_REAL_MAP (m, sx, sy)) 81 if (OUT_OF_REAL_MAP (m, sx, sy))
82 { 82 {
83 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");
84 return 1; 84 return 1;
85 } 85 }
86 86
87 /* Save some cycles - instead of calling get_map_flags(), just get the value 87 mapspace &ms = m->at (sx, sy);
88 * directly.
89 */
90 mflags = m->at (sx, sy).flags ();
91 88
92 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 89 int mflags = ms.flags ();
90 int blocked = ms.move_block;
93 91
94 /* If space is currently not blocked by anything, no need to 92 /* If space is currently not blocked by anything, no need to
95 * go further. Not true for players - all sorts of special 93 * go further. Not true for players - all sorts of special
96 * things we need to do for players. 94 * things we need to do for players.
97 */ 95 */
98 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 96 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
99 return 0; 97 return 0;
100 98
101 /* 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
102 * 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
103 * 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
104 * or another. Likewise, only if something is blocking us do we 102 * or another. Likewise, only if something is blocking us do we
105 * need to investigate if there is a special circumstance that would 103 * need to investigate if there is a special circumstance that would
106 * let the player through (inventory checkers for example) 104 * let the player through (inventory checkers for example)
… …
113 /* 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
114 * 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
115 * true. If we get through the entire stack, that must mean 113 * true. If we get through the entire stack, that must mean
116 * ob is blocking it, so return 0. 114 * ob is blocking it, so return 0.
117 */ 115 */
118 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 116 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
119 { 117 {
120 118 if (OB_MOVE_BLOCK (ob, tmp))
121 /* This must be before the checks below. Code for inventory checkers. */
122 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
123 { 119 {
124 /* If last_sp is set, the player/monster needs an object, 120 if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
125 * so we check for it. If they don't have it, they can't 121 if (RESULT_INT (0))
126 * pass through this space. 122 return 1;
127 */ 123 else
128 if (tmp->last_sp) 124 continue;
125
126 if (tmp->type == CHECK_INV)
129 { 127 {
130 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))
131 return 1; 132 return 1;
132 else 133 }
133 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;
134 } 143 }
135 else 144 else
136 { 145 return 1; // unconditional block
137 /* In this case, the player must not have the object - 146
138 * if they do, they can't pass through.
139 */
140 if (check_inv_recursive (ob, tmp) != NULL) /* player has object */
141 return 1;
142 else
143 continue;
144 }
145 } /* if check_inv */
146 else 147 } else {
147 { 148 // space does not block the ob, directly, but
148 /* Broke apart a big nasty if into several here to make 149 // anything alive that is not a door still
149 * this more readable. first check - if the space blocks 150 // blocks anything but wizards.
150 * movement, can't move here.
151 * second - if a monster, can't move there, unless it is a
152 * hidden dm
153 */
154 if (OB_MOVE_BLOCK (ob, tmp))
155 return 1;
156 151
157 if (tmp->flag [FLAG_ALIVE] 152 if (tmp->flag [FLAG_ALIVE]
158 && tmp->head_ () != ob 153 && tmp->head_ () != ob
159 && tmp != ob 154 && tmp != ob
160 && tmp->type != DOOR 155 && tmp->type != DOOR
161 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden)) 156 && !tmp->flag [FLAG_WIZPASS])
162 return 1; 157 return 1;
163 } 158 }
164
165 } 159 }
160
166 return 0; 161 return 0;
167} 162}
168 163
169/* 164/*
170 * Returns qthe blocking object if the given object can't fit in the given 165 * Returns qthe blocking object if the given object can't fit in the given
… …
249 // go through and calculate what all the containers are carrying. 244 // go through and calculate what all the containers are carrying.
250 //TODO: remove 245 //TODO: remove
251 container->update_weight (); 246 container->update_weight ();
252} 247}
253 248
249//-GPL
250
254void 251void
255maptile::set_object_flag (int flag, int value) 252maptile::set_object_flag (int flag, int value)
256{ 253{
257 if (!spaces) 254 if (!spaces)
258 return; 255 return;
… …
272 269
273 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 270 for (mapspace *ms = spaces + size (); ms-- > spaces; )
274 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 271 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
275 INVOKE_OBJECT (RESET, tmp); 272 INVOKE_OBJECT (RESET, tmp);
276} 273}
274
275//+GPL
277 276
278/* 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
279 * 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
280 * 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
281 * they are saved). 280 * they are saved).
… …
309 op = op->above; 308 op = op->above;
310 } 309 }
311 } 310 }
312} 311}
313 312
313//-GPL
314
314/* 315/*
315 * 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
316 * file pointer. 317 * file pointer.
317 */ 318 */
318bool 319bool
… …
334 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height)) 335 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
335 { 336 {
336 // we insert manually because 337 // we insert manually because
337 // a) its way faster 338 // a) its way faster
338 // b) we remove manually, too, and there are good reasons for that 339 // b) we remove manually, too, and there are good reasons for that
339 // c) its correct 340 // c) it's correct
340 mapspace &ms = at (op->x, op->y); 341 mapspace &ms = at (op->x, op->y);
341 342
342 op->flag [FLAG_REMOVED] = false; 343 op->flag [FLAG_REMOVED] = false;
343 344
344 op->above = 0; 345 op->above = 0;
345 op->below = ms.top; 346 op->below = ms.top;
346 347
347 if (ms.top)
348 ms.top->above = op; 348 *(ms.top ? &ms.top->above : &ms.bot) = op;
349 else
350 ms.bot = op;
351 349
352 ms.top = op; 350 ms.top = op;
353 ms.flags_ = 0; 351 ms.flags_ = 0;
354 } 352 }
355 else 353 else
… …
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
… …
695 } 695 }
696 696
697 abort (); 697 abort ();
698} 698}
699 699
700//+GPL
701
700/****************************************************************************** 702/******************************************************************************
701 * This is the start of unique map handling code 703 * This is the start of unique map handling code
702 *****************************************************************************/ 704 *****************************************************************************/
703 705
704/* This goes through the maptile and removed any unique items on the map. */ 706/* This goes through the maptile and removed any unique items on the map. */
… …
720 722
721 op = above; 723 op = above;
722 } 724 }
723 } 725 }
724} 726}
727
728//-GPL
725 729
726bool 730bool
727maptile::_save_header (object_freezer &freezer) 731maptile::_save_header (object_freezer &freezer)
728{ 732{
729#define MAP_OUT(k) freezer.put (KW_ ## k, k) 733#define MAP_OUT(k) freezer.put (KW_ ## k, k)
… …
737 MAP_OUT (reset_timeout); 741 MAP_OUT (reset_timeout);
738 MAP_OUT (fixed_resettime); 742 MAP_OUT (fixed_resettime);
739 MAP_OUT (no_reset); 743 MAP_OUT (no_reset);
740 MAP_OUT (no_drop); 744 MAP_OUT (no_drop);
741 MAP_OUT (difficulty); 745 MAP_OUT (difficulty);
742
743 if (default_region) MAP_OUT2 (region, default_region->name); 746 if (default_region) MAP_OUT2 (region, default_region->name);
744 747
745 if (shopitems) 748 if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
746 {
747 char shop[MAX_BUF];
748 print_shop_string (this, shop);
749 MAP_OUT2 (shopitems, shop);
750 }
751
752 MAP_OUT (shopgreed); 749 MAP_OUT (shopgreed);
753 MAP_OUT (shopmin); 750 MAP_OUT (shopmin);
754 MAP_OUT (shopmax); 751 MAP_OUT (shopmax);
755 if (shoprace) MAP_OUT (shoprace); 752 if (shoprace) MAP_OUT (shoprace);
753
756 MAP_OUT (darkness); 754 MAP_OUT (darkness);
757 MAP_OUT (width); 755 MAP_OUT (width);
758 MAP_OUT (height); 756 MAP_OUT (height);
759 MAP_OUT (enter_x); 757 MAP_OUT (enter_x);
760 MAP_OUT (enter_y); 758 MAP_OUT (enter_y);
… …
792 if (!_save_header (freezer)) 790 if (!_save_header (freezer))
793 return false; 791 return false;
794 792
795 return freezer.save (path); 793 return freezer.save (path);
796} 794}
795
796//+GPL
797 797
798/* 798/*
799 * Remove and free all objects in the given map. 799 * Remove and free all objects in the given map.
800 */ 800 */
801void 801void
… …
1518 else 1518 else
1519 { 1519 {
1520 retval->distance_x += op2->x - x; 1520 retval->distance_x += op2->x - x;
1521 retval->distance_y += op2->y - y; 1521 retval->distance_y += op2->y - y;
1522 1522
1523 retval->part = NULL; 1523 retval->part = 0;
1524 retval->distance = idistance (retval->distance_x, retval->distance_y); 1524 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1525 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1525 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1526 } 1526 }
1527} 1527}
1528 1528
1529/* 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
… …
1540 int dx, dy; 1540 int dx, dy;
1541 1541
1542 return adjacent_map (op1->map, op2->map, &dx, &dy); 1542 return adjacent_map (op1->map, op2->map, &dx, &dy);
1543} 1543}
1544 1544
1545//-GPL
1546
1545object * 1547object *
1546maptile::insert (object *op, int x, int y, object *originator, int flags) 1548maptile::insert (object *op, int x, int y, object *originator, int flags)
1547{ 1549{
1548 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);
1549} 1551}
… …
1560 if (default_region) 1562 if (default_region)
1561 return default_region; 1563 return default_region;
1562 1564
1563 return ::region::default_region (); 1565 return ::region::default_region ();
1564} 1566}
1567
1568//+GPL
1565 1569
1566/* picks a random object from a style map. 1570/* picks a random object from a style map.
1567 */ 1571 */
1568object * 1572object *
1569maptile::pick_random_object (rand_gen &gen) const 1573maptile::pick_random_object (rand_gen &gen) const
… …
1585 1589
1586 // instead of crashing in the unlikely(?) case, try to return *something* 1590 // instead of crashing in the unlikely(?) case, try to return *something*
1587 return archetype::find ("bug"); 1591 return archetype::find ("bug");
1588} 1592}
1589 1593
1594//-GPL
1595
1590void 1596void
1591maptile::play_sound (faceidx sound, int x, int y) const 1597maptile::play_sound (faceidx sound, int x, int y) const
1592{ 1598{
1593 if (!sound) 1599 if (!sound)
1594 return; 1600 return;
… …
1601 1607
1602 int distance = idistance (dx, dy); 1608 int distance = idistance (dx, dy);
1603 1609
1604 if (distance <= MAX_SOUND_DISTANCE) 1610 if (distance <= MAX_SOUND_DISTANCE)
1605 ns->play_sound (sound, dx, dy); 1611 ns->play_sound (sound, dx, dy);
1612 }
1613}
1614
1615void
1616maptile::say_msg (const char *msg, int x, int y) const
1617{
1618 for_all_players (pl)
1619 if (client *ns = pl->ns)
1620 {
1621 int dx = x - pl->ob->x;
1622 int dy = y - pl->ob->y;
1623
1624 int distance = idistance (dx, dy);
1625
1626 if (distance <= MAX_SOUND_DISTANCE)
1627 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1606 } 1628 }
1607} 1629}
1608 1630
1609static void 1631static void
1610split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy) 1632split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)

Diff Legend

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