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.148 by root, Mon Sep 29 10:31:32 2008 UTC vs.
Revision 1.162 by root, Tue Oct 13 18:22:44 2009 UTC

… …
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 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
31sint8 maptile::outdoor_darkness;
29 32
30/* This rolls up wall, blocks_magic, blocks_view, etc, all into 33/* This rolls up wall, blocks_magic, blocks_view, etc, all into
31 * one function that just returns a P_.. value (see map.h) 34 * one function that just returns a P_.. value (see map.h)
32 * it will also do map translation for tiled maps, returning 35 * it will also do map translation for tiled maps, returning
33 * 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
… …
68 * by the caller. 71 * by the caller.
69 */ 72 */
70int 73int
71blocked_link (object *ob, maptile *m, int sx, int sy) 74blocked_link (object *ob, maptile *m, int sx, int sy)
72{ 75{
73 object *tmp;
74 int mflags, blocked;
75
76 /* 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
77 * have already checked this. 77 * have already checked this.
78 */ 78 */
79 if (OUT_OF_REAL_MAP (m, sx, sy)) 79 if (OUT_OF_REAL_MAP (m, sx, sy))
80 { 80 {
… …
83 } 83 }
84 84
85 /* 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
86 * directly. 86 * directly.
87 */ 87 */
88 mflags = m->at (sx, sy).flags (); 88 mapspace &ms = m->at (sx, sy);
89 89
90 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 90 int mflags = ms.flags ();
91 int blocked = ms.move_block;
91 92
92 /* If space is currently not blocked by anything, no need to 93 /* If space is currently not blocked by anything, no need to
93 * go further. Not true for players - all sorts of special 94 * go further. Not true for players - all sorts of special
94 * things we need to do for players. 95 * things we need to do for players.
95 */ 96 */
96 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 97 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
97 return 0; 98 return 0;
98 99
99 /* 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
100 * 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
101 * 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
102 * or another. Likewise, only if something is blocking us do we 103 * or another. Likewise, only if something is blocking us do we
103 * need to investigate if there is a special circumstance that would 104 * need to investigate if there is a special circumstance that would
104 * let the player through (inventory checkers for example) 105 * let the player through (inventory checkers for example)
… …
111 /* 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
112 * 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
113 * true. If we get through the entire stack, that must mean 114 * true. If we get through the entire stack, that must mean
114 * ob is blocking it, so return 0. 115 * ob is blocking it, so return 0.
115 */ 116 */
116 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 117 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
117 { 118 {
119 bool block = OB_MOVE_BLOCK (ob, tmp);
118 120
119 /* This must be before the checks below. Code for inventory checkers. */ 121 /* This must be before the checks below. Code for inventory checkers. */
120 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp)) 122 if (block && tmp->type == CHECK_INV)
121 { 123 {
124 bool have = check_inv_recursive (ob, tmp);
125
122 /* If last_sp is set, the player/monster needs an object, 126 /* If last_sp is set, the player/monster needs an object,
123 * so we check for it. If they don't have it, they can't 127 * so we check for it. If they don't have it, they can't
124 * pass through this space. 128 * pass through this space.
125 */ 129 */
126 if (tmp->last_sp) 130 if (tmp->last_sp)
127 { 131 {
128 if (check_inv_recursive (ob, tmp) == NULL) 132 if (!have)
129 return 1; 133 return 1;
130 else
131 continue;
132 } 134 }
133 else 135 else
134 { 136 {
135 /* In this case, the player must not have the object - 137 /* In this case, the player must not have the object -
136 * if they do, they can't pass through. 138 * if they do, they can't pass through.
137 */ 139 */
138 if (check_inv_recursive (ob, tmp) != NULL) /* player has object */ 140 if (have)
139 return 1; 141 return 1;
140 else
141 continue;
142 } 142 }
143 } /* if check_inv */ 143 }
144 else if (block && tmp->type == T_MATCH)
145 {
146 //TODO
147 }
144 else 148 else
145 { 149 {
146 /* Broke apart a big nasty if into several here to make 150 /* Broke apart a big nasty if into several here to make
147 * this more readable. first check - if the space blocks 151 * this more readable. first check - if the space blocks
148 * movement, can't move here. 152 * movement, can't move here.
149 * second - if a monster, can't move there, unless it is a 153 * second - if a monster, can't move there, unless it is a
150 * hidden dm 154 * dm.
151 */ 155 */
152 if (OB_MOVE_BLOCK (ob, tmp)) 156 if (block)
153 return 1; 157 return 1;
154 158
155 if (tmp->flag [FLAG_ALIVE] 159 if (tmp->flag [FLAG_ALIVE]
156 && tmp->head_ () != ob 160 && tmp->head_ () != ob
157 && tmp != ob 161 && tmp != ob
158 && tmp->type != DOOR 162 && tmp->type != DOOR
159 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden)) 163 && !tmp->flag [FLAG_WIZ])
160 return 1; 164 return 1;
161 } 165 }
162
163 } 166 }
167
164 return 0; 168 return 0;
165} 169}
166 170
167/* 171/*
168 * Returns qthe blocking object if the given object can't fit in the given 172 * Returns qthe blocking object if the given object can't fit in the given
… …
332 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height)) 336 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
333 { 337 {
334 // we insert manually because 338 // we insert manually because
335 // a) its way faster 339 // a) its way faster
336 // b) we remove manually, too, and there are good reasons for that 340 // b) we remove manually, too, and there are good reasons for that
337 // c) its correct 341 // c) it's correct
338 mapspace &ms = at (op->x, op->y); 342 mapspace &ms = at (op->x, op->y);
339 343
340 op->flag [FLAG_REMOVED] = false; 344 op->flag [FLAG_REMOVED] = false;
341 345
342 op->above = 0; 346 op->above = 0;
343 op->below = ms.top; 347 op->below = ms.top;
344 348
345 if (ms.top)
346 ms.top->above = op; 349 *(ms.top ? &ms.top->above : &ms.bot) = op;
347 else
348 ms.bot = op;
349 350
350 ms.top = op; 351 ms.top = op;
351 ms.flags_ = 0; 352 ms.flags_ = 0;
352 } 353 }
353 else 354 else
… …
930 destroy = 1; 931 destroy = 1;
931 } 932 }
932 933
933 /* adjust overall chance below */ 934 /* adjust overall chance below */
934 if (destroy && rndm (0, 1)) 935 if (destroy && rndm (0, 1))
935 op->destroy (true); 936 op->destroy ();
936 }
937}
938
939/*
940 * Updates every button on the map (by calling update_button() for them).
941 */
942void
943maptile::update_buttons ()
944{
945 for (oblinkpt *obp = buttons; obp; obp = obp->next)
946 for (objectlink *ol = obp->link; ol; ol = ol->next)
947 {
948 if (!ol->ob)
949 {
950 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
951 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
952 continue;
953 }
954
955 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
956 {
957 update_button (ol->ob);
958 break;
959 }
960 } 937 }
961} 938}
962 939
963/* 940/*
964 * This routine is supposed to find out the difficulty of the map. 941 * This routine is supposed to find out the difficulty of the map.
965 * difficulty does not have a lot to do with character level, 942 * difficulty does not have a lot to do with character level,
966 * but does have a lot to do with treasure on the map. 943 * but does have a lot to do with treasure on the map.
967 * 944 *
968 * Difficulty can now be set by the map creature. If the value stored 945 * Difficulty can now be set by the map creator. If the value stored
969 * in the map is zero, then use this routine. Maps should really 946 * in the map is zero, then use this routine. Maps should really
970 * have a difficulty set than using this function - human calculation 947 * have a difficulty set rather than using this function - human calculation
971 * is much better than this functions guesswork. 948 * is much better than this function's guesswork.
972 */ 949 */
973int 950int
974maptile::estimate_difficulty () const 951maptile::estimate_difficulty () const
975{ 952{
976 long monster_cnt = 0; 953 long monster_cnt = 0;
… …
1021 * postive values make it darker, negative make it brighter 998 * postive values make it darker, negative make it brighter
1022 */ 999 */
1023int 1000int
1024maptile::change_map_light (int change) 1001maptile::change_map_light (int change)
1025{ 1002{
1026 int new_level = darkness + change;
1027
1028 /* Nothing to do */ 1003 /* Nothing to do */
1029 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 1004 if (!change)
1030 return 0; 1005 return 0;
1031 1006
1032 /* inform all players on the map */ 1007 /* inform all players on the map */
1033 if (change > 0) 1008 if (change > 0)
1034 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 1009 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1035 else 1010 else
1036 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 1011 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1037 1012
1038 /* Do extra checking. since darkness is a unsigned value, 1013 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 1014
1050 /* All clients need to get re-updated for the change */ 1015 /* All clients need to get re-updated for the change */
1051 update_all_map_los (this); 1016 update_all_map_los (this);
1052 1017
1053 return 1; 1018 return 1;
… …
1061 */ 1026 */
1062void 1027void
1063mapspace::update_ () 1028mapspace::update_ ()
1064{ 1029{
1065 object *last = 0; 1030 object *last = 0;
1066 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1031 uint8 flags = P_UPTODATE, anywhere = 0;
1032 sint8 light = 0;
1067 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1033 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1068 1034
1069 //object *middle = 0; 1035 //object *middle = 0;
1070 //object *top = 0; 1036 //object *top = 0;
1071 //object *floor = 0; 1037 //object *floor = 0;
… …
1074 object *&middle = faces_obj[1] = 0; 1040 object *&middle = faces_obj[1] = 0;
1075 object *&floor = faces_obj[2] = 0; 1041 object *&floor = faces_obj[2] = 0;
1076 1042
1077 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above) 1043 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1078 { 1044 {
1079 /* This could be made additive I guess (two lights better than 1045 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1080 * one). But if so, it shouldn't be a simple additive - 2
1081 * light bulbs do not illuminate twice as far as once since
1082 * it is a dissapation factor that is cubed.
1083 */
1084 light = max (light, tmp->glow_radius); 1046 light += tmp->glow_radius;
1085 1047
1086 /* This call is needed in order to update objects the player 1048 /* This call is needed in order to update objects the player
1087 * is standing in that have animations (ie, grass, fire, etc). 1049 * is standing in that have animations (ie, grass, fire, etc).
1088 * However, it also causes the look window to be re-drawn 1050 * However, it also causes the look window to be re-drawn
1089 * 3 times each time the player moves, because many of the 1051 * 3 times each time the player moves, because many of the
… …
1137 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1099 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1138 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE; 1100 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1139 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC; 1101 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1140 } 1102 }
1141 1103
1142 this->light = light; 1104 this->light = min (light, MAX_LIGHT_RADIUS);
1143 this->flags_ = flags; 1105 this->flags_ = flags;
1144 this->move_block = move_block & ~move_allow; 1106 this->move_block = move_block & ~move_allow;
1145 this->move_on = move_on; 1107 this->move_on = move_on;
1146 this->move_off = move_off; 1108 this->move_off = move_off;
1147 this->move_slow = move_slow; 1109 this->move_slow = move_slow;
… …
1229 vol += op->volume (); 1191 vol += op->volume ();
1230 1192
1231 return vol; 1193 return vol;
1232} 1194}
1233 1195
1234bool 1196maptile *
1235maptile::tile_available (int dir, bool load) 1197maptile::tile_available (int dir, bool load)
1236{ 1198{
1237 if (!tile_path[dir]) 1199 if (tile_path[dir])
1238 return 0; 1200 {
1239
1240 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE)) 1201 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1241 return 1; 1202 return tile_map[dir];
1242 1203
1243 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1204 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1244 return 1; 1205 return tile_map[dir];
1206 }
1245 1207
1246 return 0; 1208 return 0;
1247} 1209}
1248 1210
1249/* this returns TRUE if the coordinates (x,y) are out of 1211/* this returns TRUE if the coordinates (x,y) are out of
… …
1555 else 1517 else
1556 { 1518 {
1557 retval->distance_x += op2->x - x; 1519 retval->distance_x += op2->x - x;
1558 retval->distance_y += op2->y - y; 1520 retval->distance_y += op2->y - y;
1559 1521
1560 retval->part = NULL; 1522 retval->part = 0;
1561 retval->distance = idistance (retval->distance_x, retval->distance_y); 1523 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1562 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1524 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1563 } 1525 }
1564} 1526}
1565 1527
1566/* Returns true of op1 and op2 are effectively on the same map 1528/* Returns true of op1 and op2 are effectively on the same map
… …
1628maptile::play_sound (faceidx sound, int x, int y) const 1590maptile::play_sound (faceidx sound, int x, int y) const
1629{ 1591{
1630 if (!sound) 1592 if (!sound)
1631 return; 1593 return;
1632 1594
1595 for_all_players_on_map (pl, this)
1596 if (client *ns = pl->ns)
1597 {
1598 int dx = x - pl->ob->x;
1599 int dy = y - pl->ob->y;
1600
1601 int distance = idistance (dx, dy);
1602
1603 if (distance <= MAX_SOUND_DISTANCE)
1604 ns->play_sound (sound, dx, dy);
1605 }
1606}
1607
1608void
1609maptile::say_msg (const char *msg, int x, int y) const
1610{
1633 for_all_players (pl) 1611 for_all_players (pl)
1634 if (pl->ob->map == this)
1635 if (client *ns = pl->ns) 1612 if (client *ns = pl->ns)
1636 { 1613 {
1637 int dx = x - pl->ob->x; 1614 int dx = x - pl->ob->x;
1638 int dy = y - pl->ob->y; 1615 int dy = y - pl->ob->y;
1639 1616
1640 int distance = idistance (dx, dy); 1617 int distance = idistance (dx, dy);
1641 1618
1642 if (distance <= MAX_SOUND_DISTANCE) 1619 if (distance <= MAX_SOUND_DISTANCE)
1643 ns->play_sound (sound, dx, dy); 1620 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1644 } 1621 }
1645} 1622}
1646 1623
1624static void
1625split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1626{
1627 // clip to map to the left
1628 if (x0 < 0)
1629 {
1630 if (maptile *tile = m->tile_available (TILE_LEFT, 1))
1631 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1632
1633 if (x1 < 0) // entirely to the left
1634 return;
1635
1636 x0 = 0;
1637 }
1638
1639 // clip to map to the right
1640 if (x1 > m->width)
1641 {
1642 if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
1643 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1644
1645 if (x0 > m->width) // entirely to the right
1646 return;
1647
1648 x1 = m->width;
1649 }
1650
1651 // clip to map above
1652 if (y0 < 0)
1653 {
1654 if (maptile *tile = m->tile_available (TILE_UP, 1))
1655 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1656
1657 if (y1 < 0) // entirely above
1658 return;
1659
1660 y0 = 0;
1661 }
1662
1663 // clip to map below
1664 if (y1 > m->height)
1665 {
1666 if (maptile *tile = m->tile_available (TILE_DOWN, 1))
1667 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1668
1669 if (y0 > m->height) // entirely below
1670 return;
1671
1672 y1 = m->height;
1673 }
1674
1675 // if we get here, the rect is within the current map
1676 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1677
1678 r->m = m;
1679 r->x0 = x0;
1680 r->y0 = y0;
1681 r->x1 = x1;
1682 r->y1 = y1;
1683 r->dx = dx;
1684 r->dy = dy;
1685}
1686
1687maprect *
1688maptile::split_to_tiles (int x0, int y0, int x1, int y1)
1689{
1690 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1691 buf.clear ();
1692
1693 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1694
1695 // add end marker
1696 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1697 r->m = 0;
1698
1699 return (maprect *)buf.linearise ();
1700}
1701

Diff Legend

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