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.146 by root, Sun Aug 17 22:46:26 2008 UTC vs.
Revision 1.166 by root, Wed Oct 21 00:44:39 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
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 {
81 LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n"); 81 LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n");
82 return 1; 82 return 1;
83 } 83 }
84 84
85 /* Save some cycles - instead of calling get_map_flags(), just get the value 85 mapspace &ms = m->at (sx, sy);
86 * directly.
87 */
88 mflags = m->at (sx, sy).flags ();
89 86
90 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 87 int mflags = ms.flags ();
88 int blocked = ms.move_block;
91 89
92 /* If space is currently not blocked by anything, no need to 90 /* If space is currently not blocked by anything, no need to
93 * go further. Not true for players - all sorts of special 91 * go further. Not true for players - all sorts of special
94 * things we need to do for players. 92 * things we need to do for players.
95 */ 93 */
96 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 94 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
97 return 0; 95 return 0;
98 96
99 /* if there isn't anytyhing alive on this space, and this space isn't 97 /* 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 98 * 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 99 * 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 100 * or another. Likewise, only if something is blocking us do we
103 * need to investigate if there is a special circumstance that would 101 * need to investigate if there is a special circumstance that would
104 * let the player through (inventory checkers for example) 102 * let the player through (inventory checkers for example)
… …
111 /* We basically go through the stack of objects, and if there is 109 /* 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 110 * some other object that has NO_PASS or FLAG_ALIVE set, return
113 * true. If we get through the entire stack, that must mean 111 * true. If we get through the entire stack, that must mean
114 * ob is blocking it, so return 0. 112 * ob is blocking it, so return 0.
115 */ 113 */
116 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 114 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
117 { 115 {
118 116 if (OB_MOVE_BLOCK (ob, tmp))
119 /* This must be before the checks below. Code for inventory checkers. */
120 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
121 { 117 {
122 /* If last_sp is set, the player/monster needs an object, 118 if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
123 * so we check for it. If they don't have it, they can't 119 if (RESULT_INT (0))
124 * pass through this space. 120 return 1;
125 */ 121 else
126 if (tmp->last_sp) 122 continue;
123
124 if (tmp->type == CHECK_INV)
127 { 125 {
128 if (check_inv_recursive (ob, tmp) == NULL) 126 bool have = check_inv_recursive (ob, tmp);
127
128 // last_sp set means we block if we don't have.
129 if (logical_xor (have, tmp->last_sp))
129 return 1; 130 return 1;
130 else 131 }
131 continue; 132 else if (tmp->type == T_MATCH)
133 {
134 // T_MATCH allows "entrance" iff the match is true
135 // == blocks if the match fails
136
137 // we could have used an INVOKE_OBJECT, but decided against it, as we
138 // assume that T_MATCH is relatively common.
139 if (!match (tmp->slaying, ob, tmp, ob))
140 return 1;
132 } 141 }
133 else 142 else
134 { 143 return 1; // unconditional block
135 /* In this case, the player must not have the object - 144
136 * if they do, they can't pass through.
137 */
138 if (check_inv_recursive (ob, tmp) != NULL) /* player has object */
139 return 1;
140 else
141 continue;
142 }
143 } /* if check_inv */
144 else 145 } else {
145 { 146 // space does not block the ob, directly, but
146 /* Broke apart a big nasty if into several here to make 147 // anything alive that is not a door still
147 * this more readable. first check - if the space blocks 148 // blocks anything but wizards.
148 * movement, can't move here.
149 * second - if a monster, can't move there, unless it is a
150 * hidden dm
151 */
152 if (OB_MOVE_BLOCK (ob, tmp))
153 return 1;
154 149
155 if (tmp->flag [FLAG_ALIVE] 150 if (tmp->flag [FLAG_ALIVE]
156 && tmp->head_ () != ob 151 && tmp->head_ () != ob
157 && tmp != ob 152 && tmp != ob
158 && tmp->type != DOOR 153 && tmp->type != DOOR
159 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden)) 154 && !tmp->flag [FLAG_WIZPASS])
160 return 1; 155 return 1;
161 } 156 }
162
163 } 157 }
158
164 return 0; 159 return 0;
165} 160}
166 161
167/* 162/*
168 * Returns qthe blocking object if the given object can't fit in the given 163 * 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)) 327 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
333 { 328 {
334 // we insert manually because 329 // we insert manually because
335 // a) its way faster 330 // a) its way faster
336 // b) we remove manually, too, and there are good reasons for that 331 // b) we remove manually, too, and there are good reasons for that
337 // c) its correct 332 // c) it's correct
338 mapspace &ms = at (op->x, op->y); 333 mapspace &ms = at (op->x, op->y);
339 334
340 op->flag [FLAG_REMOVED] = false; 335 op->flag [FLAG_REMOVED] = false;
341 336
342 op->above = 0; 337 op->above = 0;
343 op->below = ms.top; 338 op->below = ms.top;
344 339
345 if (ms.top)
346 ms.top->above = op; 340 *(ms.top ? &ms.top->above : &ms.bot) = op;
347 else
348 ms.bot = op;
349 341
350 ms.top = op; 342 ms.top = op;
351 ms.flags_ = 0; 343 ms.flags_ = 0;
352 } 344 }
353 else 345 else
… …
565 return items; 557 return items;
566} 558}
567 559
568/* opposite of parse string, this puts the string that was originally fed in to 560/* opposite of parse string, this puts the string that was originally fed in to
569 * the map (or something equivilent) into output_string. */ 561 * the map (or something equivilent) into output_string. */
570static void 562static const char *
571print_shop_string (maptile *m, char *output_string) 563print_shop_string (maptile *m)
572{ 564{
573 int i; 565 static dynbuf_text buf; buf.clear ();
574 char tmp[MAX_BUF];
575 566
576 strcpy (output_string, "");
577 for (i = 0; i < m->shopitems[0].index; i++) 567 for (int i = 0; i < m->shopitems[0].index; i++)
578 { 568 {
579 if (m->shopitems[i].typenum) 569 if (m->shopitems[i].typenum)
580 { 570 {
581 if (m->shopitems[i].strength) 571 if (m->shopitems[i].strength)
582 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 572 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
583 else 573 else
584 sprintf (tmp, "%s;", m->shopitems[i].name); 574 buf.printf ("%s;", m->shopitems[i].name);
585 } 575 }
586 else 576 else
587 { 577 {
588 if (m->shopitems[i].strength) 578 if (m->shopitems[i].strength)
589 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 579 buf.printf ("*:%d;", m->shopitems[i].strength);
590 else 580 else
591 sprintf (tmp, "*"); 581 buf.printf ("*");
592 } 582 }
593
594 strcat (output_string, tmp);
595 } 583 }
584
585 return buf;
596} 586}
597 587
598/* This loads the header information of the map. The header 588/* This loads the header information of the map. The header
599 * contains things like difficulty, size, timeout, etc. 589 * contains things like difficulty, size, timeout, etc.
600 * this used to be stored in the map object, but with the 590 * this used to be stored in the map object, but with the
… …
712 702
713 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 703 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
714 unique = 1; 704 unique = 1;
715 705
716 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 706 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
717 {
718 op->destroy_inv (false);
719 op->destroy (); 707 op->destroy ();
720 }
721 708
722 op = above; 709 op = above;
723 } 710 }
724 } 711 }
725} 712}
… …
738 MAP_OUT (reset_timeout); 725 MAP_OUT (reset_timeout);
739 MAP_OUT (fixed_resettime); 726 MAP_OUT (fixed_resettime);
740 MAP_OUT (no_reset); 727 MAP_OUT (no_reset);
741 MAP_OUT (no_drop); 728 MAP_OUT (no_drop);
742 MAP_OUT (difficulty); 729 MAP_OUT (difficulty);
743
744 if (default_region) MAP_OUT2 (region, default_region->name); 730 if (default_region) MAP_OUT2 (region, default_region->name);
745 731
746 if (shopitems) 732 if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
747 {
748 char shop[MAX_BUF];
749 print_shop_string (this, shop);
750 MAP_OUT2 (shopitems, shop);
751 }
752
753 MAP_OUT (shopgreed); 733 MAP_OUT (shopgreed);
754 MAP_OUT (shopmin); 734 MAP_OUT (shopmin);
755 MAP_OUT (shopmax); 735 MAP_OUT (shopmax);
756 if (shoprace) MAP_OUT (shoprace); 736 if (shoprace) MAP_OUT (shoprace);
737
757 MAP_OUT (darkness); 738 MAP_OUT (darkness);
758 MAP_OUT (width); 739 MAP_OUT (width);
759 MAP_OUT (height); 740 MAP_OUT (height);
760 MAP_OUT (enter_x); 741 MAP_OUT (enter_x);
761 MAP_OUT (enter_y); 742 MAP_OUT (enter_y);
… …
813 794
814 op->flag [FLAG_REMOVED] = true; 795 op->flag [FLAG_REMOVED] = true;
815 796
816 object *head = op->head_ (); 797 object *head = op->head_ ();
817 if (op == head) 798 if (op == head)
818 {
819 op->destroy_inv (false);
820 op->destroy (); 799 op->destroy ();
821 }
822 else if (head->map != op->map) 800 else if (head->map != op->map)
823 { 801 {
824 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ()); 802 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
825 head->destroy (); 803 head->destroy ();
826 } 804 }
… …
941 op->destroy (); 919 op->destroy ();
942 } 920 }
943} 921}
944 922
945/* 923/*
946 * Updates every button on the map (by calling update_button() for them).
947 */
948void
949maptile::update_buttons ()
950{
951 for (oblinkpt *obp = buttons; obp; obp = obp->next)
952 for (objectlink *ol = obp->link; ol; ol = ol->next)
953 {
954 if (!ol->ob)
955 {
956 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
957 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
958 continue;
959 }
960
961 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
962 {
963 update_button (ol->ob);
964 break;
965 }
966 }
967}
968
969/*
970 * This routine is supposed to find out the difficulty of the map. 924 * This routine is supposed to find out the difficulty of the map.
971 * difficulty does not have a lot to do with character level, 925 * difficulty does not have a lot to do with character level,
972 * but does have a lot to do with treasure on the map. 926 * but does have a lot to do with treasure on the map.
973 * 927 *
974 * Difficulty can now be set by the map creature. If the value stored 928 * Difficulty can now be set by the map creator. If the value stored
975 * in the map is zero, then use this routine. Maps should really 929 * in the map is zero, then use this routine. Maps should really
976 * have a difficulty set than using this function - human calculation 930 * have a difficulty set rather than using this function - human calculation
977 * is much better than this functions guesswork. 931 * is much better than this function's guesswork.
978 */ 932 */
979int 933int
980maptile::estimate_difficulty () const 934maptile::estimate_difficulty () const
981{ 935{
982 long monster_cnt = 0; 936 long monster_cnt = 0;
… …
1027 * postive values make it darker, negative make it brighter 981 * postive values make it darker, negative make it brighter
1028 */ 982 */
1029int 983int
1030maptile::change_map_light (int change) 984maptile::change_map_light (int change)
1031{ 985{
1032 int new_level = darkness + change;
1033
1034 /* Nothing to do */ 986 /* Nothing to do */
1035 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 987 if (!change)
1036 return 0; 988 return 0;
1037 989
1038 /* inform all players on the map */ 990 /* inform all players on the map */
1039 if (change > 0) 991 if (change > 0)
1040 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 992 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1041 else 993 else
1042 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 994 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1043 995
1044 /* Do extra checking. since darkness is a unsigned value, 996 darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1045 * we need to be extra careful about negative values.
1046 * In general, the checks below are only needed if change
1047 * is not +/-1
1048 */
1049 if (new_level < 0)
1050 darkness = 0;
1051 else if (new_level >= MAX_DARKNESS)
1052 darkness = MAX_DARKNESS;
1053 else
1054 darkness = new_level;
1055 997
1056 /* All clients need to get re-updated for the change */ 998 /* All clients need to get re-updated for the change */
1057 update_all_map_los (this); 999 update_all_map_los (this);
1058 1000
1059 return 1; 1001 return 1;
… …
1067 */ 1009 */
1068void 1010void
1069mapspace::update_ () 1011mapspace::update_ ()
1070{ 1012{
1071 object *last = 0; 1013 object *last = 0;
1072 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1014 uint8 flags = P_UPTODATE, anywhere = 0;
1015 sint8 light = 0;
1073 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1016 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1074 1017
1075 //object *middle = 0; 1018 //object *middle = 0;
1076 //object *top = 0; 1019 //object *top = 0;
1077 //object *floor = 0; 1020 //object *floor = 0;
… …
1080 object *&middle = faces_obj[1] = 0; 1023 object *&middle = faces_obj[1] = 0;
1081 object *&floor = faces_obj[2] = 0; 1024 object *&floor = faces_obj[2] = 0;
1082 1025
1083 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above) 1026 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1084 { 1027 {
1085 /* This could be made additive I guess (two lights better than 1028 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1086 * one). But if so, it shouldn't be a simple additive - 2
1087 * light bulbs do not illuminate twice as far as once since
1088 * it is a dissapation factor that is cubed.
1089 */
1090 light = max (light, tmp->glow_radius); 1029 light += tmp->glow_radius;
1091 1030
1092 /* This call is needed in order to update objects the player 1031 /* This call is needed in order to update objects the player
1093 * is standing in that have animations (ie, grass, fire, etc). 1032 * is standing in that have animations (ie, grass, fire, etc).
1094 * However, it also causes the look window to be re-drawn 1033 * However, it also causes the look window to be re-drawn
1095 * 3 times each time the player moves, because many of the 1034 * 3 times each time the player moves, because many of the
… …
1143 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1082 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1144 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE; 1083 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1145 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC; 1084 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1146 } 1085 }
1147 1086
1148 this->light = light; 1087 this->light = min (light, MAX_LIGHT_RADIUS);
1149 this->flags_ = flags; 1088 this->flags_ = flags;
1150 this->move_block = move_block & ~move_allow; 1089 this->move_block = move_block & ~move_allow;
1151 this->move_on = move_on; 1090 this->move_on = move_on;
1152 this->move_off = move_off; 1091 this->move_off = move_off;
1153 this->move_slow = move_slow; 1092 this->move_slow = move_slow;
… …
1235 vol += op->volume (); 1174 vol += op->volume ();
1236 1175
1237 return vol; 1176 return vol;
1238} 1177}
1239 1178
1240bool 1179maptile *
1241maptile::tile_available (int dir, bool load) 1180maptile::tile_available (int dir, bool load)
1242{ 1181{
1243 if (!tile_path[dir]) 1182 if (tile_path[dir])
1244 return 0; 1183 {
1245
1246 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE)) 1184 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1247 return 1; 1185 return tile_map[dir];
1248 1186
1249 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1187 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1250 return 1; 1188 return tile_map[dir];
1189 }
1251 1190
1252 return 0; 1191 return 0;
1253} 1192}
1254 1193
1255/* this returns TRUE if the coordinates (x,y) are out of 1194/* this returns TRUE if the coordinates (x,y) are out of
… …
1561 else 1500 else
1562 { 1501 {
1563 retval->distance_x += op2->x - x; 1502 retval->distance_x += op2->x - x;
1564 retval->distance_y += op2->y - y; 1503 retval->distance_y += op2->y - y;
1565 1504
1566 retval->part = NULL; 1505 retval->part = 0;
1567 retval->distance = idistance (retval->distance_x, retval->distance_y); 1506 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1568 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1507 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1569 } 1508 }
1570} 1509}
1571 1510
1572/* Returns true of op1 and op2 are effectively on the same map 1511/* Returns true of op1 and op2 are effectively on the same map
… …
1634maptile::play_sound (faceidx sound, int x, int y) const 1573maptile::play_sound (faceidx sound, int x, int y) const
1635{ 1574{
1636 if (!sound) 1575 if (!sound)
1637 return; 1576 return;
1638 1577
1578 for_all_players_on_map (pl, this)
1579 if (client *ns = pl->ns)
1580 {
1581 int dx = x - pl->ob->x;
1582 int dy = y - pl->ob->y;
1583
1584 int distance = idistance (dx, dy);
1585
1586 if (distance <= MAX_SOUND_DISTANCE)
1587 ns->play_sound (sound, dx, dy);
1588 }
1589}
1590
1591void
1592maptile::say_msg (const char *msg, int x, int y) const
1593{
1639 for_all_players (pl) 1594 for_all_players (pl)
1640 if (pl->ob->map == this)
1641 if (client *ns = pl->ns) 1595 if (client *ns = pl->ns)
1642 { 1596 {
1643 int dx = x - pl->ob->x; 1597 int dx = x - pl->ob->x;
1644 int dy = y - pl->ob->y; 1598 int dy = y - pl->ob->y;
1645 1599
1646 int distance = idistance (dx, dy); 1600 int distance = idistance (dx, dy);
1647 1601
1648 if (distance <= MAX_SOUND_DISTANCE) 1602 if (distance <= MAX_SOUND_DISTANCE)
1649 ns->play_sound (sound, dx, dy); 1603 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1650 } 1604 }
1651} 1605}
1652 1606
1607static void
1608split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1609{
1610 // clip to map to the left
1611 if (x0 < 0)
1612 {
1613 if (maptile *tile = m->tile_available (TILE_LEFT, 1))
1614 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1615
1616 if (x1 < 0) // entirely to the left
1617 return;
1618
1619 x0 = 0;
1620 }
1621
1622 // clip to map to the right
1623 if (x1 > m->width)
1624 {
1625 if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
1626 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1627
1628 if (x0 > m->width) // entirely to the right
1629 return;
1630
1631 x1 = m->width;
1632 }
1633
1634 // clip to map above
1635 if (y0 < 0)
1636 {
1637 if (maptile *tile = m->tile_available (TILE_UP, 1))
1638 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1639
1640 if (y1 < 0) // entirely above
1641 return;
1642
1643 y0 = 0;
1644 }
1645
1646 // clip to map below
1647 if (y1 > m->height)
1648 {
1649 if (maptile *tile = m->tile_available (TILE_DOWN, 1))
1650 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1651
1652 if (y0 > m->height) // entirely below
1653 return;
1654
1655 y1 = m->height;
1656 }
1657
1658 // if we get here, the rect is within the current map
1659 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1660
1661 r->m = m;
1662 r->x0 = x0;
1663 r->y0 = y0;
1664 r->x1 = x1;
1665 r->y1 = y1;
1666 r->dx = dx;
1667 r->dy = dy;
1668}
1669
1670maprect *
1671maptile::split_to_tiles (int x0, int y0, int x1, int y1)
1672{
1673 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1674 buf.clear ();
1675
1676 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1677
1678 // add end marker
1679 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1680 r->m = 0;
1681
1682 return (maprect *)buf.linearise ();
1683}
1684

Diff Legend

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