ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.115 by root, Wed Jul 11 15:57:31 2007 UTC vs.
Revision 1.143 by root, Tue Dec 23 06:58:24 2008 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
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
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your 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,
… …
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 GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24/** 24/**
25 * \file 25 * \file
26 * Client handling. 26 * Client handling.
… …
98 */ 98 */
99 mx = ns->mapx; 99 mx = ns->mapx;
100 my = ns->mapy; 100 my = ns->mapy;
101 101
102 /* the x and y here are coordinates for the new map, i.e. if we moved 102 /* the x and y here are coordinates for the new map, i.e. if we moved
103 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, 103 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
104 * if the destination x or y coordinate is outside the viewable 104 * if the destination x or y coordinate is outside the viewable
105 * area, we clear the values - otherwise, the old values 105 * area, we clear the values - otherwise, the old values
106 * are preserved, and the check_head thinks it needs to clear them. 106 * are preserved, and the check_head thinks it needs to clear them.
107 */ 107 */
108 for (x = 0; x < mx; x++) 108 for (x = 0; x < mx; x++)
109 {
110 for (y = 0; y < my; y++) 109 for (y = 0; y < my; y++)
111 {
112 if (x >= ns->mapx || y >= ns->mapy) 110 if (x >= ns->mapx || y >= ns->mapy)
113 /* clear cells outside the viewable area */ 111 /* clear cells outside the viewable area */
114 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 112 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
115 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy) 113 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
116 /* clear newly visible tiles within the viewable area */ 114 /* clear newly visible tiles within the viewable area */
117 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 115 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
118 else 116 else
119 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 117 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
120 }
121 }
122 118
123 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 119 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
124 120
125 /* Make sure that the next "map1" command will be sent (even if it is 121 /* Make sure that the next "map1" command will be sent (even if it is
126 * empty). 122 * empty).
… …
129} 125}
130 126
131static void 127static void
132clear_map (player *pl) 128clear_map (player *pl)
133{ 129{
130 pl->ns->mapinfo_queue_clear ();
131
134 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 132 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
135 133
136 pl->ns->force_newmap = false; 134 pl->ns->force_newmap = false;
137 135
138 if (pl->ns->newmapcmd == 1) 136 if (pl->ns->newmapcmd == 1)
139 pl->ns->send_packet ("newmap"); 137 pl->ns->send_packet ("newmap");
140 138
141 pl->ns->floorbox_reset (); 139 pl->ns->floorbox_reset ();
140}
141
142static void
143send_map_info (player *pl)
144{
145 client &socket = *pl->ns;
146 object *ob = pl->observe;
147
148 if (socket.mapinfocmd)
149 {
150 if (ob->map && ob->map->path[0])
151 {
152 int flags = 0;
153
154 if (ob->map->tile_path[0]) flags |= 1;
155 if (ob->map->tile_path[1]) flags |= 2;
156 if (ob->map->tile_path[2]) flags |= 4;
157 if (ob->map->tile_path[3]) flags |= 8;
158
159 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
160 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
161 ob->map->width, ob->map->height, &ob->map->path);
162 }
163 else
164 socket.send_packet ("mapinfo current");
165 }
142} 166}
143 167
144/** check for map/region change and send new map data */ 168/** check for map/region change and send new map data */
145static void 169static void
146check_map_change (player *pl) 170check_map_change (player *pl)
147{ 171{
148 client &socket = *pl->ns; 172 client &socket = *pl->ns;
149 object *ob = pl->observe; 173 object *ob = pl->observe;
150 174
175 region *reg = ob->region ();
176 if (socket.current_region != reg)
177 {
178 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
179 socket.current_region = reg;
180 }
181
182 // first try to aovid a full newmap on tiled map scrolls
183 if (socket.current_map != ob->map && !socket.force_newmap)
184 {
185 rv_vector rv;
186
187 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
188
189 // manhattan distance is very handy here
190 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
191 {
192 socket.current_map = ob->map;
193 socket.current_x = ob->x;
194 socket.current_y = ob->y;
195
196 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
197 socket.floorbox_reset ();
198 send_map_info (pl);
199 }
200 }
201
151 if (socket.current_map != ob->map || socket.force_newmap) 202 if (socket.current_map != ob->map || socket.force_newmap)
152 { 203 {
153 clear_map (pl); 204 clear_map (pl);
154 socket.current_map = ob->map; 205 socket.current_map = ob->map;
155 206 send_map_info (pl);
156 if (socket.mapinfocmd)
157 {
158 if (ob->map && ob->map->path[0])
159 {
160 int flags = 0;
161
162 if (ob->map->tile_path[0]) flags |= 1;
163 if (ob->map->tile_path[1]) flags |= 2;
164 if (ob->map->tile_path[2]) flags |= 4;
165 if (ob->map->tile_path[3]) flags |= 8;
166
167 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
168 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
169 ob->map->width, ob->map->height, &ob->map->path);
170 }
171 else
172 socket.send_packet ("mapinfo current");
173 }
174 } 207 }
175 else if (socket.current_x != ob->x || socket.current_y != ob->y) 208 else if (socket.current_x != ob->x || socket.current_y != ob->y)
176 { 209 {
177 int dx = ob->x - socket.current_x; 210 int dx = ob->x - socket.current_x;
178 int dy = ob->y - socket.current_y; 211 int dy = ob->y - socket.current_y;
… …
186 } 219 }
187 } 220 }
188 221
189 socket.current_x = ob->x; 222 socket.current_x = ob->x;
190 socket.current_y = ob->y; 223 socket.current_y = ob->y;
191
192 region *reg = ob->region ();
193 if (socket.current_region != reg)
194 {
195 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
196 socket.current_region = reg;
197 }
198} 224}
199 225
200/** 226/**
201 * RequestInfo is sort of a meta command. There is some specific 227 * RequestInfo is sort of a meta command. There is some specific
202 * request of information, but we call other functions to provide 228 * request of information, but we call other functions to provide
… …
246{ 272{
247 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 273 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
248} 274}
249 275
250void 276void
277client::mapinfo_queue_clear ()
278{
279 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
280 free (*i);
281
282 mapinfo_queue.clear ();
283}
284
285bool
286client::mapinfo_try (char *buf)
287{
288 char *token = buf;
289 buf += strlen (buf) + 9;
290
291 // initial map and its origin
292 maptile *map = pl->observe->map;
293 int mapx = pl->ns->mapx / 2 - pl->observe->x;
294 int mapy = pl->ns->mapy / 2 - pl->observe->y;
295 int max_distance = 8; // limit maximum path length to something generous
296
297 while (*buf && map && max_distance)
298 {
299 int dir = *buf++ - '1';
300
301 if (dir >= 0 && dir <= 3)
302 {
303 if (!map->tile_path [dir])
304 map = 0;
305 else if (map->tile_available (dir, false))
306 {
307 maptile *neigh = map->tile_map [dir];
308
309 switch (dir)
310 {
311 case 0: mapy -= neigh->height; break;
312 case 2: mapy += map ->height; break;
313 case 3: mapx -= neigh->width ; break;
314 case 1: mapx += map ->width ; break;
315 }
316
317 map = neigh;
318 --max_distance;
319 }
320 else
321 return 0;
322 }
323 else
324 max_distance = 0;
325 }
326
327 if (!max_distance)
328 send_packet_printf ("mapinfo %s error", token);
329 else if (!map || !map->path)
330 send_packet_printf ("mapinfo %s nomap", token);
331 else
332 {
333 int flags = 0;
334
335 if (map->tile_path[0]) flags |= 1;
336 if (map->tile_path[1]) flags |= 2;
337 if (map->tile_path[2]) flags |= 4;
338 if (map->tile_path[3]) flags |= 8;
339
340 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
341 }
342
343 return 1;
344}
345
346void
347client::mapinfo_queue_run ()
348{
349 if (mapinfo_queue.empty () || !pl)
350 return;
351
352 for (int i = 0; i < mapinfo_queue.size (); ++i)
353 if (mapinfo_try (mapinfo_queue [i]))
354 {
355 free (mapinfo_queue [i]);
356 mapinfo_queue.erase (i);
357 }
358 else
359 ++i;
360}
361
362void
251MapInfoCmd (char *buf, int len, player *pl) 363MapInfoCmd (char *buf, int len, player *pl)
252{ 364{
253 // <mapinfo tag spatial tile-path 365 // <mapinfo tag spatial tile-path
254 // >mapinfo tag spatial flags x y w h hash 366 // >mapinfo tag spatial flags x y w h hash
255 367
256 char bigbuf[MAX_BUF], *token;
257
258 token = buf; 368 char *token = buf;
259 // copy token 369
260 if (!(buf = strchr (buf, ' '))) 370 if (!(buf = strchr (buf, ' ')))
261 return; 371 return;
262 372
263 *buf++ = 0;
264
265 if (!strncmp (buf, "spatial ", 8)) 373 if (!strncmp (buf, " spatial ", 9))
266 { 374 {
267 buf += 8; 375 char *copy = strdup (token);
376 copy [buf - token] = 0;
268 377
269 // initial map and its origin 378#if 0
270 maptile *map = pl->ob->map; 379 // this makes only sense when we flush the buffer immediately
271 sint16 dx, dy; 380 if (pl->ns->mapinfo_try (copy))
272 int mapx = pl->ns->mapx / 2 - pl->ob->x; 381 free (copy);
273 int mapy = pl->ns->mapy / 2 - pl->ob->y;
274 int max_distance = 8; // limit maximum path length to something generous
275
276 while (*buf && map && max_distance)
277 {
278 int dir = *buf++;
279
280 switch (dir)
281 {
282 case '1':
283 dx = 0;
284 dy = -1;
285 map = map->xy_find (dx, dy);
286 map && (mapy -= map->height);
287 break;
288 case '2':
289 mapx += map->width;
290 dx = map->width;
291 dy = 0;
292 map = map->xy_find (dx, dy);
293 break;
294 case '3':
295 mapy += map->height;
296 dx = 0;
297 dy = map->height;
298 map = map->xy_find (dx, dy);
299 break;
300 case '4':
301 dx = -1;
302 dy = 0;
303 map = map->xy_find (dx, dy);
304 map && (mapx -= map->width);
305 break;
306 }
307
308 --max_distance;
309 }
310
311 if (!max_distance)
312 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
313 else if (map && map->path[0])
314 {
315 int flags = 0;
316
317 if (map->tile_path[0]) flags |= 1;
318 if (map->tile_path[1]) flags |= 2;
319 if (map->tile_path[2]) flags |= 4;
320 if (map->tile_path[3]) flags |= 8;
321
322 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
323 }
324 else 382 else
325 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 383#endif
384 pl->ns->mapinfo_queue.push_back (copy);
326 } 385 }
327 else 386 else
328 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 387 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
329
330 pl->ns->send_packet (bigbuf);
331} 388}
332 389
333/** This is the Setup cmd */ 390/** This is the Setup cmd */
334void 391void
335SetUp (char *buf, int len, client * ns) 392SetUp (char *buf, int len, client * ns)
… …
653 * syntax is: move (to) (tag) (nrof) 710 * syntax is: move (to) (tag) (nrof)
654 */ 711 */
655void 712void
656MoveCmd (char *buf, int len, player *pl) 713MoveCmd (char *buf, int len, player *pl)
657{ 714{
658 int vals[3], i; 715 int to, tag, nrof;
659 716
660 /* A little funky here. We only cycle for 2 records, because 717 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
661 * we obviously are not going to find a space after the third
662 * record. Perhaps we should just replace this with a
663 * sscanf?
664 */
665 for (i = 0; i < 2; i++)
666 { 718 {
667 vals[i] = atoi (buf);
668
669 if (!(buf = strchr (buf, ' ')))
670 {
671 LOG (llevError, "Incomplete move command: %s\n", buf); 719 LOG (llevError, "Incomplete move command: %s\n", buf);
672 return; 720 return;
673 }
674
675 buf++;
676 } 721 }
677 722
678 vals[2] = atoi (buf); 723 esrv_move_object (pl->ob, to, tag, nrof);
679
680/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
681 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
682} 724}
683 725
684/****************************************************************************** 726/******************************************************************************
685 * 727 *
686 * Start of commands the server sends to the client. 728 * Start of commands the server sends to the client.
… …
787 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 829 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
788 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 830 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
789 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 831 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
790 832
791 for (int s = 0; s < NUM_SKILLS; s++) 833 for (int s = 0; s < NUM_SKILLS; s++)
792 if (object *skill = opl->last_skill_ob[s]) 834 if (object *skill = opl->last_skill_ob [s])
793 if (skill->stats.exp != ns->last_skill_exp [s]) 835 if (skill->stats.exp != ns->last_skill_exp [s])
794 { 836 {
795 ns->last_skill_exp [s] = skill->stats.exp; 837 ns->last_skill_exp [s] = skill->stats.exp;
796 838
797 /* Always send along the level if exp changes. This is only 839 /* Always send along the level if exp changes. This is only
… …
853 895
854/** 896/**
855 * Tells the client that here is a player it should start using. 897 * Tells the client that here is a player it should start using.
856 */ 898 */
857void 899void
858esrv_new_player (player *pl, uint32 weight) 900esrv_new_player (player *pl)
859{ 901{
902 sint32 weight = pl->ob->client_weight ();
903
860 packet sl ("player"); 904 packet sl ("player");
861 905
862 sl << uint32 (pl->ob->count) 906 sl << uint32 (pl->ob->count)
863 << uint32 (weight) 907 << uint32 (weight)
864 << uint32 (pl->ob->face) 908 << uint32 (pl->ob->face)
865 << data8 (pl->ob->name); 909 << data8 (pl->ob->name);
866 910
867 pl->ns->last_weight = weight; 911 pl->ns->last_weight = weight;
868 pl->ns->send_packet (sl); 912 pl->ns->send_packet (sl);
869 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
870} 913}
871 914
872/****************************************************************************** 915/******************************************************************************
873 * 916 *
874 * Start of map related commands. 917 * Start of map related commands.
… …
931 974
932 if (!ns.faces_sent[face_num]) 975 if (!ns.faces_sent[face_num])
933 if (ob) 976 if (ob)
934 ns.send_faces (ob); 977 ns.send_faces (ob);
935 else 978 else
936 ns.send_face (face_num); 979 ns.send_face (face_num, 10);
937 980
938 sl << uint16 (face_num); 981 sl << uint16 (face_num);
939 return 1; 982 return 1;
940 } 983 }
941 984
… …
992{ 1035{
993 object *ob = pl->observe; 1036 object *ob = pl->observe;
994 if (!ob->active) 1037 if (!ob->active)
995 return; 1038 return;
996 1039
997 maptile *plmap = ob->map;
998
999 /* If player is just joining the game, he isn't here yet, so the map 1040 /* If player is just joining the game, he isn't here yet, so the map
1000 * can get swapped out. If so, don't try to send them a map. All will 1041 * can get swapped out. If so, don't try to send them a map. All will
1001 * be OK once they really log in. 1042 * be OK once they really log in.
1002 */ 1043 */
1003 if (!plmap || plmap->in_memory != MAP_IN_MEMORY) 1044 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1004 return; 1045 return;
1005 1046
1006 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1047 int startlen, oldlen;
1007 int estartlen, eoldlen; 1048 int estartlen, eoldlen;
1008 uint8 eentrysize; 1049 uint8 eentrysize;
1009 uint16 ewhatstart, ewhatflag; 1050 uint16 ewhatstart, ewhatflag;
1010 uint8 extendedinfos; 1051 uint8 extendedinfos;
1011 1052
1012 check_map_change (pl); 1053 check_map_change (pl);
1013 prefetch_surrounding_maps (pl->ob); 1054 prefetch_surrounding_maps (pl->ob);
1014 1055
1015 /* do LOS after calls to update_position */ 1056 /* do LOS after calls to update_position */
1016 if (ob != pl->ob) 1057 /* unfortunately, we need to udpate los when observing, currently */
1017 clear_los (pl); 1058 if (pl->do_los || pl->observe != pl->ob)
1018 else if (pl->do_los)
1019 { 1059 {
1020 update_los (ob);
1021 pl->do_los = 0; 1060 pl->do_los = 0;
1061 pl->update_los ();
1022 } 1062 }
1023 1063
1024 /** 1064 /**
1025 * This function uses the new map1 protocol command to send the map 1065 * This function uses the new map1 protocol command to send the map
1026 * to the client. It is necessary because the old map command supports 1066 * to the client. It is necessary because the old map command supports
… …
1068 << uint8 (eentrysize); 1108 << uint8 (eentrysize);
1069 1109
1070 estartlen = esl.length (); 1110 estartlen = esl.length ();
1071 } 1111 }
1072 1112
1073 /* x,y are the real map locations. ax, ay are viewport relative
1074 * locations.
1075 */
1076 ay = 0;
1077
1078 /* We could do this logic as conditionals in the if statement, 1113 /* We could do this logic as conditionals in the if statement,
1079 * but that started to get a bit messy to look at. 1114 * but that started to get a bit messy to look at.
1080 */ 1115 */
1081 max_x = ob->x + (socket.mapx + 1) / 2; 1116 int hx = socket.mapx / 2;
1082 max_y = ob->y + (socket.mapy + 1) / 2; 1117 int hy = socket.mapy / 2;
1083 1118
1084 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++) 1119 for (int dx = -hx; dx <= hx; dx++)
1085 { 1120 {
1086 sint16 nx, ny; 1121 sint16 nx, ny;
1087 maptile *m = 0; 1122 maptile *m = 0;
1088 1123
1089 ax = 0; 1124 for (int dy = -hy; dy <= hy; dy++)
1090 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1091 { 1125 {
1092 // check to see if we can simply go one right quickly 1126 // check to see if we can simply go one down quickly
1093 ++nx;
1094 if (m && nx >= m->width) 1127 if (m && ++ny >= m->height)
1095 m = 0; 1128 m = 0;
1096 1129
1130 // no, so do it the slow way
1097 if (!m) 1131 if (!m)
1098 { 1132 {
1099 nx = x; ny = y; m = plmap; 1133 nx = ob->x + dx; ny = ob->y + dy; m = ob->map;
1100 1134
1101 if (!xy_normalise (m, nx, ny)) 1135 if (xy_normalise (m, nx, ny))
1136 m->touch ();
1137 else
1102 m = 0; 1138 m = 0;
1103 } 1139 }
1140
1141 int ax = dx + hx;
1142 int ay = dy + hy;
1104 1143
1105 int emask, mask; 1144 int emask, mask;
1106 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1145 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1107 1146
1108 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1147 MapCell &lastcell = socket.lastmap.cells[ax][ay];
… …
1110 /* If the coordinates are not valid, or it is too dark to see, 1149 /* If the coordinates are not valid, or it is too dark to see,
1111 * we tell the client as such 1150 * we tell the client as such
1112 */ 1151 */
1113 if (!m) 1152 if (!m)
1114 { 1153 {
1115 /* space is out of map. Update space and clear values 1154 /* space is out of map. Update space and clear values
1116 * if this hasn't already been done. If the space is out 1155 * if this hasn't already been done. If the space is out
1117 * of the map, it shouldn't have a head 1156 * of the map, it shouldn't have a head.
1118 */ 1157 */
1119 if (lastcell.count != -1) 1158 if (lastcell.count != -1)
1120 { 1159 {
1121 sl << uint16 (mask); 1160 sl << uint16 (mask);
1122 map_clearcell (&lastcell, -1); 1161 map_clearcell (&lastcell, -1);
1123 } 1162 }
1124 1163
1125 continue; 1164 continue;
1126 } 1165 }
1127 1166
1128 m->touch ();
1129
1130 int d = pl->blocked_los[ax][ay]; 1167 int d = pl->blocked_los_uc (dx, dy);
1131 1168
1132 if (d > 3) 1169 if (d > 3)
1133 { 1170 {
1134
1135 int need_send = 0, count; 1171 int need_send = 0, count;
1136 1172
1137 /* This block deals with spaces that are not visible for whatever 1173 /* This block deals with spaces that are not visible for whatever
1138 * reason. Still may need to send the head for this space. 1174 * reason. Still may need to send the head for this space.
1139 */ 1175 */
… …
1145 if (lastcell.count != -1) 1181 if (lastcell.count != -1)
1146 need_send = 1; 1182 need_send = 1;
1147 1183
1148 count = -1; 1184 count = -1;
1149 1185
1150 /* properly clear a previously sent big face */
1151 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2] 1186 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1152 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1187 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1153 need_send = 1; 1188 need_send = 1;
1154 1189
1190 /* properly clear a previously sent big face */
1155 map_clearcell (&lastcell, count); 1191 map_clearcell (&lastcell, count);
1156 1192
1157 if ((mask & 0xf) || need_send) 1193 if ((mask & 0xf) || need_send)
1158 sl[oldlen + 1] = mask & 0xff; 1194 sl[oldlen + 1] = mask & 0xff;
1159 else 1195 else
… …
1209 uint8 flags = 0; 1245 uint8 flags = 0;
1210 tag_t player = 0; 1246 tag_t player = 0;
1211 1247
1212 // send hp information, if applicable 1248 // send hp information, if applicable
1213 if (object *op = ms.faces_obj [0]) 1249 if (object *op = ms.faces_obj [0])
1214 {
1215 if (op->head || op->invisible) 1250 if (op->is_head () && !op->invisible)
1216 ; // do not show
1217 else if (op->type == PLAYER
1218 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1219 { 1251 {
1220 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) 1252 if (op->stats.maxhp > op->stats.hp
1253 && op->stats.maxhp > 0
1254 && (op->type == PLAYER
1255 || op->type == DOOR // does not work, have maxhp 0
1256 || QUERY_FLAG (op, FLAG_MONSTER)
1257 || QUERY_FLAG (op, FLAG_ALIVE)
1258 || QUERY_FLAG (op, FLAG_GENERATOR)))
1221 { 1259 {
1222 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1260 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1223 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge 1261 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1224 } 1262 }
1225 }
1226 1263
1227 if (op->msg && op->msg[0] == '@') 1264 if (op->has_dialogue ())
1228 flags |= 1; 1265 flags |= 1;
1229 1266
1230 if (op->type == PLAYER && op != ob) 1267 if (op->type == PLAYER)
1231 player = op->count; 1268 player = op == ob ? pl->ob->count
1269 : op == pl->ob ? ob->count
1270 : op->count;
1232 } 1271 }
1233 1272
1234 if (lastcell.stat_hp != stat_hp) 1273 if (lastcell.stat_hp != stat_hp)
1235 { 1274 {
1236 lastcell.stat_hp = stat_hp; 1275 lastcell.stat_hp = stat_hp;
1237 1276
… …
1279 1318
1280 /* Middle face */ 1319 /* Middle face */
1281 if (update_space (sl, socket, ms, lastcell, 1)) 1320 if (update_space (sl, socket, ms, lastcell, 1))
1282 mask |= 0x2; 1321 mask |= 0x2;
1283 1322
1323 if (ob->invisible
1324 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1284 if (ms.player () == ob 1325 && ms.player () == ob)
1285 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1286 { 1326 {
1287 // force player to be visible to himself if invisible 1327 // force player to be visible to himself if invisible
1288 if (lastcell.faces[0] != ob->face) 1328 if (lastcell.faces[0] != ob->face)
1289 { 1329 {
1290 lastcell.faces[0] = ob->face; 1330 lastcell.faces[0] = ob->face;
… …
1386{ 1426{
1387 packet sl; 1427 packet sl;
1388 sl << "replyinfo skill_info\n"; 1428 sl << "replyinfo skill_info\n";
1389 1429
1390 for (int i = 1; i < NUM_SKILLS; i++) 1430 for (int i = 1; i < NUM_SKILLS; i++)
1391 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1431 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1392 1432
1393 if (sl.length () >= MAXSOCKBUF) 1433 if (sl.length () > MAXSOCKBUF)
1394 { 1434 {
1395 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1435 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1396 fatal (0); 1436 fatal (0);
1397 } 1437 }
1398 1438
… …
1411 sl << "replyinfo spell_paths\n"; 1451 sl << "replyinfo spell_paths\n";
1412 1452
1413 for (int i = 0; i < NRSPELLPATHS; i++) 1453 for (int i = 0; i < NRSPELLPATHS; i++)
1414 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1454 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1415 1455
1416 if (sl.length () >= MAXSOCKBUF) 1456 if (sl.length () > MAXSOCKBUF)
1417 { 1457 {
1418 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1458 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1419 fatal (0); 1459 fatal (0);
1420 } 1460 }
1421 1461
… …
1440 if (spell->type == SPELL) 1480 if (spell->type == SPELL)
1441 { 1481 {
1442 int flags = 0; 1482 int flags = 0;
1443 1483
1444 /* check if we need to update it */ 1484 /* check if we need to update it */
1445 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1485 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1446 { 1486 {
1447 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1487 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1448 flags |= UPD_SP_MANA; 1488 flags |= UPD_SP_MANA;
1449 } 1489 }
1450 1490
1451 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1491 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1452 { 1492 {
1453 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1493 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1454 flags |= UPD_SP_GRACE; 1494 flags |= UPD_SP_GRACE;
1455 } 1495 }
1456 1496
1457 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1497 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1458 { 1498 {
1459 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1499 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1460 flags |= UPD_SP_DAMAGE; 1500 flags |= UPD_SP_DAMAGE;
1461 } 1501 }
1462 1502
1463 if (flags) 1503 if (flags)
1464 { 1504 {
… …
1466 1506
1467 sl << "updspell " 1507 sl << "updspell "
1468 << uint8 (flags) 1508 << uint8 (flags)
1469 << uint32 (spell->count); 1509 << uint32 (spell->count);
1470 1510
1471 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1511 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1472 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1512 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1473 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1513 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1474 1514
1475 pl->ns->send_packet (sl); 1515 pl->ns->send_packet (sl);
1476 } 1516 }
1477 } 1517 }
1478 } 1518 }
… …
1508 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1548 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1509 return; 1549 return;
1510 } 1550 }
1511 1551
1512 /* store costs and damage in the object struct, to compare to later */ 1552 /* store costs and damage in the object struct, to compare to later */
1513 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1553 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1514 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1554 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1515 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1555 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1516 1556
1517 /* figure out which skill it uses, if it uses one */ 1557 /* figure out which skill it uses, if it uses one */
1518 if (spell->skill) 1558 if (spell->skill)
1519 { 1559 if (object *tmp = pl->find_skill (spell->skill))
1520 for (i = 1; i < NUM_SKILLS; i++)
1521 if (!strcmp (spell->skill, skill_names[i]))
1522 {
1523 skill = i + CS_STAT_SKILLINFO; 1560 skill = tmp->subtype + CS_STAT_SKILLINFO;
1524 break;
1525 }
1526 }
1527 1561
1528 // spells better have a face 1562 // spells better have a face
1529 if (!spell->face) 1563 if (!spell->face)
1530 { 1564 {
1531 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1565 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1532 spell->face = face_find ("burnout.x11", blank_face); 1566 spell->face = face_find ("burnout.x11", blank_face);
1533 } 1567 }
1568
1569 pl->ns->send_face (spell->face);
1534 1570
1535 /* send the current values */ 1571 /* send the current values */
1536 sl << uint32 (spell->count) 1572 sl << uint32 (spell->count)
1537 << uint16 (spell->level) 1573 << uint16 (spell->level)
1538 << uint16 (spell->casting_time) 1574 << uint16 (spell->casting_time)
1539 << uint16 (spell->last_sp) 1575 << uint16 (spell->cached_sp)
1540 << uint16 (spell->last_grace) 1576 << uint16 (spell->cached_grace)
1541 << uint16 (spell->last_eat) 1577 << uint16 (spell->cached_eat)
1542 << uint8 (skill) 1578 << uint8 (skill)
1543 << uint32 (spell->path_attuned) 1579 << uint32 (spell->path_attuned)
1544 << uint32 (spell->face) 1580 << uint32 (spell->face)
1545 << data8 (spell->name) 1581 << data8 (spell->name)
1546 << data16 (spell->msg); 1582 << data16 (spell->msg);
… …
1574 * bytes and 3 strings (because that is the spec) so we need to 1610 * bytes and 3 strings (because that is the spec) so we need to
1575 * check that the length of those 3 strings, plus the 23 bytes, 1611 * check that the length of those 3 strings, plus the 23 bytes,
1576 * won't take us over the length limit for the socket, if it does, 1612 * won't take us over the length limit for the socket, if it does,
1577 * we need to send what we already have, and restart packet formation 1613 * we need to send what we already have, and restart packet formation
1578 */ 1614 */
1615 if (spell->type != SPELL)
1616 continue;
1617
1579 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1618 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1580 * to show add_spell is 26 bytes + 2 strings. However, the overun 1619 * to show add_spell is 26 bytes + 2 strings. However, the overun
1581 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1620 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1582 * like it will fix this 1621 * like it will fix this
1583 */ 1622 */
1584 if (spell->type != SPELL)
1585 continue;
1586
1587 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1623 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1588 { 1624 {
1625 pl->ns->flush_fx ();
1589 pl->ns->send_packet (sl); 1626 pl->ns->send_packet (sl);
1590 1627
1591 sl.reset (); 1628 sl.reset ();
1592 sl << "addspell "; 1629 sl << "addspell ";
1593 } 1630 }
… …
1601 return; 1638 return;
1602 } 1639 }
1603 else 1640 else
1604 append_spell (pl, sl, spell); 1641 append_spell (pl, sl, spell);
1605 1642
1606 if (sl.length () >= MAXSOCKBUF) 1643 if (sl.length () > MAXSOCKBUF)
1607 { 1644 {
1608 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1645 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1609 fatal (0); 1646 fatal (0);
1610 } 1647 }
1611 1648
1612 /* finally, we can send the packet */ 1649 /* finally, we can send the packet */
1650 pl->ns->flush_fx ();
1613 pl->ns->send_packet (sl); 1651 pl->ns->send_packet (sl);
1614} 1652}
1615 1653

Diff Legend

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