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.108 by root, Sat Jun 9 20:51:45 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 Multiplayer Online Role Playing Game. 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 it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * 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, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * 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>
23 */ 22 */
24 23
25/** 24/**
26 * \file 25 * \file
27 * Client handling. 26 * Client handling.
… …
99 */ 98 */
100 mx = ns->mapx; 99 mx = ns->mapx;
101 my = ns->mapy; 100 my = ns->mapy;
102 101
103 /* 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
104 * (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,
105 * if the destination x or y coordinate is outside the viewable 104 * if the destination x or y coordinate is outside the viewable
106 * area, we clear the values - otherwise, the old values 105 * area, we clear the values - otherwise, the old values
107 * 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.
108 */ 107 */
109 for (x = 0; x < mx; x++) 108 for (x = 0; x < mx; x++)
110 {
111 for (y = 0; y < my; y++) 109 for (y = 0; y < my; y++)
112 {
113 if (x >= ns->mapx || y >= ns->mapy) 110 if (x >= ns->mapx || y >= ns->mapy)
114 /* clear cells outside the viewable area */ 111 /* clear cells outside the viewable area */
115 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 112 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
116 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)
117 /* clear newly visible tiles within the viewable area */ 114 /* clear newly visible tiles within the viewable area */
118 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 115 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
119 else 116 else
120 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));
121 }
122 }
123 118
124 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 119 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
125 120
126 /* 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
127 * empty). 122 * empty).
… …
130} 125}
131 126
132static void 127static void
133clear_map (player *pl) 128clear_map (player *pl)
134{ 129{
130 pl->ns->mapinfo_queue_clear ();
131
135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 132 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
136 133
137 pl->ns->force_newmap = false; 134 pl->ns->force_newmap = false;
138 135
139 if (pl->ns->newmapcmd == 1) 136 if (pl->ns->newmapcmd == 1)
140 pl->ns->send_packet ("newmap"); 137 pl->ns->send_packet ("newmap");
141 138
142 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 }
143} 166}
144 167
145/** check for map/region change and send new map data */ 168/** check for map/region change and send new map data */
146static void 169static void
147check_map_change (player *pl) 170check_map_change (player *pl)
148{ 171{
149 client &socket = *pl->ns; 172 client &socket = *pl->ns;
150 object *ob = pl->observe; 173 object *ob = pl->observe;
151 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
152 if (socket.current_map != ob->map || socket.force_newmap) 202 if (socket.current_map != ob->map || socket.force_newmap)
153 { 203 {
154 clear_map (pl); 204 clear_map (pl);
155 socket.current_map = ob->map; 205 socket.current_map = ob->map;
156 206 send_map_info (pl);
157 if (socket.mapinfocmd)
158 {
159 if (ob->map && ob->map->path[0])
160 {
161 int flags = 0;
162
163 if (ob->map->tile_path[0]) flags |= 1;
164 if (ob->map->tile_path[1]) flags |= 2;
165 if (ob->map->tile_path[2]) flags |= 4;
166 if (ob->map->tile_path[3]) flags |= 8;
167
168 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
169 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
170 ob->map->width, ob->map->height, &ob->map->path);
171 }
172 else
173 socket.send_packet ("mapinfo current");
174 }
175 } 207 }
176 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)
177 { 209 {
178 int dx = ob->x - socket.current_x; 210 int dx = ob->x - socket.current_x;
179 int dy = ob->y - socket.current_y; 211 int dy = ob->y - socket.current_y;
… …
187 } 219 }
188 } 220 }
189 221
190 socket.current_x = ob->x; 222 socket.current_x = ob->x;
191 socket.current_y = ob->y; 223 socket.current_y = ob->y;
192
193 region *reg = ob->region ();
194 if (socket.current_region != reg)
195 {
196 socket.current_region = reg;
197 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
198 }
199} 224}
200 225
201/** 226/**
202 * RequestInfo is sort of a meta command. There is some specific 227 * RequestInfo is sort of a meta command. There is some specific
203 * request of information, but we call other functions to provide 228 * request of information, but we call other functions to provide
204 * that information. 229 * that information.
205 */ 230 */
206void 231void
207RequestInfo (char *buf, int len, client * ns) 232RequestInfo (char *buf, int len, client *ns)
208{ 233{
209 char *params = NULL, *cp; 234 char *params;
210
211 /* No match */
212 char bigbuf[MAX_BUF];
213 int slen;
214
215 /* Set up replyinfo before we modify any of the buffers - this is used
216 * if we don't find a match.
217 */
218 strcpy (bigbuf, "replyinfo ");
219 slen = strlen (bigbuf);
220 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
221 235
222 /* find the first space, make it null, and update the 236 /* find the first space, make it null, and update the
223 * params pointer. 237 * params pointer.
224 */ 238 */
225 for (cp = buf; *cp != '\0'; cp++) 239 for (params = buf; *params; params++)
226 if (*cp == ' ') 240 if (*params == ' ')
227 { 241 {
228 *cp = '\0';
229 params = cp + 1; 242 *params++ = 0;
230 break; 243 break;
231 } 244 }
232 245
233 if (!strcmp (buf, "image_info")) 246 if (!strcmp (buf, "image_info"))
234 send_image_info (ns, params); 247 send_image_info (ns, params);
… …
237 else if (!strcmp (buf, "skill_info")) 250 else if (!strcmp (buf, "skill_info"))
238 send_skill_info (ns, params); 251 send_skill_info (ns, params);
239 else if (!strcmp (buf, "spell_paths")) 252 else if (!strcmp (buf, "spell_paths"))
240 send_spell_paths (ns, params); 253 send_spell_paths (ns, params);
241 else 254 else
242 ns->send_packet (bigbuf, len); 255 {
256 // undo tokenisation above and send replyinfo with the request unchanged
257 if (*params)
258 *--params = ' ';
259
260 ns->send_packet_printf ("replyinfo %s", buf);
261 }
243} 262}
244 263
245void 264void
246ExtCmd (char *buf, int len, player *pl) 265ExtCmd (char *buf, int len, player *pl)
247{ 266{
… …
250 269
251void 270void
252ExtiCmd (char *buf, int len, client *ns) 271ExtiCmd (char *buf, int len, client *ns)
253{ 272{
254 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 273 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
274}
275
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;
255} 360}
256 361
257void 362void
258MapInfoCmd (char *buf, int len, player *pl) 363MapInfoCmd (char *buf, int len, player *pl)
259{ 364{
260 // <mapinfo tag spatial tile-path 365 // <mapinfo tag spatial tile-path
261 // >mapinfo tag spatial flags x y w h hash 366 // >mapinfo tag spatial flags x y w h hash
262 367
263 char bigbuf[MAX_BUF], *token;
264
265 token = buf; 368 char *token = buf;
266 // copy token 369
267 if (!(buf = strchr (buf, ' '))) 370 if (!(buf = strchr (buf, ' ')))
268 return; 371 return;
269 372
270 *buf++ = 0;
271
272 if (!strncmp (buf, "spatial ", 8)) 373 if (!strncmp (buf, " spatial ", 9))
273 { 374 {
274 buf += 8; 375 char *copy = strdup (token);
376 copy [buf - token] = 0;
275 377
276 // initial map and its origin 378#if 0
277 maptile *map = pl->ob->map; 379 // this makes only sense when we flush the buffer immediately
278 sint16 dx, dy; 380 if (pl->ns->mapinfo_try (copy))
279 int mapx = pl->ns->mapx / 2 - pl->ob->x; 381 free (copy);
280 int mapy = pl->ns->mapy / 2 - pl->ob->y;
281 int max_distance = 8; // limit maximum path length to something generous
282
283 while (*buf && map && max_distance)
284 {
285 int dir = *buf++;
286
287 switch (dir)
288 {
289 case '1':
290 dx = 0;
291 dy = -1;
292 map = map->xy_find (dx, dy);
293 map && (mapy -= map->height);
294 break;
295 case '2':
296 mapx += map->width;
297 dx = map->width;
298 dy = 0;
299 map = map->xy_find (dx, dy);
300 break;
301 case '3':
302 mapy += map->height;
303 dx = 0;
304 dy = map->height;
305 map = map->xy_find (dx, dy);
306 break;
307 case '4':
308 dx = -1;
309 dy = 0;
310 map = map->xy_find (dx, dy);
311 map && (mapx -= map->width);
312 break;
313 }
314
315 --max_distance;
316 }
317
318 if (!max_distance)
319 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
320 else if (map && map->path[0])
321 {
322 int flags = 0;
323
324 if (map->tile_path[0]) flags |= 1;
325 if (map->tile_path[1]) flags |= 2;
326 if (map->tile_path[2]) flags |= 4;
327 if (map->tile_path[3]) flags |= 8;
328
329 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
330 }
331 else 382 else
332 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 383#endif
384 pl->ns->mapinfo_queue.push_back (copy);
333 } 385 }
334 else 386 else
335 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 387 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
336
337 pl->ns->send_packet (bigbuf);
338} 388}
339 389
340/** This is the Setup cmd */ 390/** This is the Setup cmd */
341void 391void
342SetUp (char *buf, int len, client * ns) 392SetUp (char *buf, int len, client * ns)
… …
471 521
472 ns->send_packet (cmdback); 522 ns->send_packet (cmdback);
473} 523}
474 524
475/** 525/**
476 * client requested an image. send it rate-limited
477 * before flushing.
478 */
479void
480AskFaceCmd (char *buf, int len, client *ns)
481{
482 ns->askface.push_back (atoi (buf));
483}
484
485/**
486 * Tells client the picture it has to use
487 * to smooth a picture number given as argument.
488 */
489void
490AskSmooth (char *buf, int len, client *ns)
491{
492 ns->send_face (atoi (buf));
493 ns->flush_fx ();
494}
495
496/**
497 * This handles the general commands from the client (ie, north, fire, cast, 526 * This handles the general commands from the client (ie, north, fire, cast,
498 * etc.) 527 * etc.)
499 */ 528 */
500void 529void
501PlayerCmd (char *buf, int len, player *pl) 530PlayerCmd (char *buf, int len, player *pl)
… …
533void 562void
534NewPlayerCmd (char *buf, int len, player *pl) 563NewPlayerCmd (char *buf, int len, player *pl)
535{ 564{
536 if (len <= 6) 565 if (len <= 6)
537 { 566 {
538 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 567 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
539 return; 568 return;
540 } 569 }
541 570
542 uint16 cmdid = net_uint16 ((uint8 *)buf); 571 uint16 cmdid = net_uint16 ((uint8 *)buf);
543 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 572 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
681 * syntax is: move (to) (tag) (nrof) 710 * syntax is: move (to) (tag) (nrof)
682 */ 711 */
683void 712void
684MoveCmd (char *buf, int len, player *pl) 713MoveCmd (char *buf, int len, player *pl)
685{ 714{
686 int vals[3], i; 715 int to, tag, nrof;
687 716
688 /* A little funky here. We only cycle for 2 records, because 717 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
689 * we obviously are not going to find a space after the third
690 * record. Perhaps we should just replace this with a
691 * sscanf?
692 */
693 for (i = 0; i < 2; i++)
694 { 718 {
695 vals[i] = atoi (buf);
696
697 if (!(buf = strchr (buf, ' ')))
698 {
699 LOG (llevError, "Incomplete move command: %s\n", buf); 719 LOG (llevError, "Incomplete move command: %s\n", buf);
700 return; 720 return;
701 }
702
703 buf++;
704 } 721 }
705 722
706 vals[2] = atoi (buf); 723 esrv_move_object (pl->ob, to, tag, nrof);
707
708/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
709 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
710} 724}
711 725
712/****************************************************************************** 726/******************************************************************************
713 * 727 *
714 * Start of commands the server sends to the client. 728 * Start of commands the server sends to the client.
… …
747 761
748 //TODO: maybe golem should become the current_weapon, quite simply? 762 //TODO: maybe golem should become the current_weapon, quite simply?
749 if (pl->golem) 763 if (pl->golem)
750 buf << " Golem*: " << pl->golem->name; 764 buf << " Golem*: " << pl->golem->name;
751 765
766 buf << '\0';
752 buf.linearise (obuf); 767 buf.linearise (obuf);
753 obuf [buf.size ()] = 0;
754} 768}
755 769
756#define AddIfInt64(Old,New,Type) if (Old != New) {\ 770#define AddIfInt64(Old,New,Type) if (Old != New) {\
757 Old = New; \ 771 Old = New; \
758 sl << uint8 (Type) << uint64 (New); \ 772 sl << uint8 (Type) << uint64 (New); \
… …
815 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 829 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
816 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 830 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
817 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 831 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
818 832
819 for (int s = 0; s < NUM_SKILLS; s++) 833 for (int s = 0; s < NUM_SKILLS; s++)
820 if (object *skill = opl->last_skill_ob[s]) 834 if (object *skill = opl->last_skill_ob [s])
821 if (skill->stats.exp != ns->last_skill_exp [s]) 835 if (skill->stats.exp != ns->last_skill_exp [s])
822 { 836 {
823 ns->last_skill_exp [s] = skill->stats.exp; 837 ns->last_skill_exp [s] = skill->stats.exp;
824 838
825 /* Always send along the level if exp changes. This is only 839 /* Always send along the level if exp changes. This is only
… …
881 895
882/** 896/**
883 * 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.
884 */ 898 */
885void 899void
886esrv_new_player (player *pl, uint32 weight) 900esrv_new_player (player *pl)
887{ 901{
902 sint32 weight = pl->ob->client_weight ();
903
888 packet sl ("player"); 904 packet sl ("player");
889 905
890 sl << uint32 (pl->ob->count) 906 sl << uint32 (pl->ob->count)
891 << uint32 (weight) 907 << uint32 (weight)
892 << uint32 (pl->ob->face) 908 << uint32 (pl->ob->face)
893 << data8 (pl->ob->name); 909 << data8 (pl->ob->name);
894 910
895 pl->ns->last_weight = weight; 911 pl->ns->last_weight = weight;
896 pl->ns->send_packet (sl); 912 pl->ns->send_packet (sl);
897 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
898} 913}
899 914
900/****************************************************************************** 915/******************************************************************************
901 * 916 *
902 * Start of map related commands. 917 * Start of map related commands.
… …
959 974
960 if (!ns.faces_sent[face_num]) 975 if (!ns.faces_sent[face_num])
961 if (ob) 976 if (ob)
962 ns.send_faces (ob); 977 ns.send_faces (ob);
963 else 978 else
964 ns.send_face (face_num); 979 ns.send_face (face_num, 10);
965 980
966 sl << uint16 (face_num); 981 sl << uint16 (face_num);
967 return 1; 982 return 1;
968 } 983 }
969 984
… …
1020{ 1035{
1021 object *ob = pl->observe; 1036 object *ob = pl->observe;
1022 if (!ob->active) 1037 if (!ob->active)
1023 return; 1038 return;
1024 1039
1025 maptile *plmap = ob->map;
1026
1027 /* 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
1028 * 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
1029 * be OK once they really log in. 1042 * be OK once they really log in.
1030 */ 1043 */
1031 if (!plmap || plmap->in_memory != MAP_IN_MEMORY) 1044 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1032 return; 1045 return;
1033 1046
1034 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1047 int startlen, oldlen;
1035 int estartlen, eoldlen; 1048 int estartlen, eoldlen;
1036 uint8 eentrysize; 1049 uint8 eentrysize;
1037 uint16 ewhatstart, ewhatflag; 1050 uint16 ewhatstart, ewhatflag;
1038 uint8 extendedinfos; 1051 uint8 extendedinfos;
1039 1052
1040 check_map_change (pl); 1053 check_map_change (pl);
1041 prefetch_surrounding_maps (pl->ob); 1054 prefetch_surrounding_maps (pl->ob);
1042 1055
1043 /* do LOS after calls to update_position */ 1056 /* do LOS after calls to update_position */
1044 if (ob != pl->ob) 1057 /* unfortunately, we need to udpate los when observing, currently */
1045 clear_los (pl); 1058 if (pl->do_los || pl->observe != pl->ob)
1046 else if (pl->do_los)
1047 { 1059 {
1048 update_los (ob);
1049 pl->do_los = 0; 1060 pl->do_los = 0;
1061 pl->update_los ();
1050 } 1062 }
1051 1063
1052 /** 1064 /**
1053 * 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
1054 * 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
… …
1096 << uint8 (eentrysize); 1108 << uint8 (eentrysize);
1097 1109
1098 estartlen = esl.length (); 1110 estartlen = esl.length ();
1099 } 1111 }
1100 1112
1101 /* x,y are the real map locations. ax, ay are viewport relative
1102 * locations.
1103 */
1104 ay = 0;
1105
1106 /* We could do this logic as conditionals in the if statement, 1113 /* We could do this logic as conditionals in the if statement,
1107 * but that started to get a bit messy to look at. 1114 * but that started to get a bit messy to look at.
1108 */ 1115 */
1109 max_x = ob->x + (socket.mapx + 1) / 2; 1116 int hx = socket.mapx / 2;
1110 max_y = ob->y + (socket.mapy + 1) / 2; 1117 int hy = socket.mapy / 2;
1111 1118
1112 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++) 1119 for (int dx = -hx; dx <= hx; dx++)
1113 { 1120 {
1114 sint16 nx, ny; 1121 sint16 nx, ny;
1115 maptile *m = 0; 1122 maptile *m = 0;
1116 1123
1117 ax = 0; 1124 for (int dy = -hy; dy <= hy; dy++)
1118 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1119 { 1125 {
1120 // check to see if we can simply go one right quickly 1126 // check to see if we can simply go one down quickly
1121 ++nx;
1122 if (m && nx >= m->width) 1127 if (m && ++ny >= m->height)
1123 m = 0; 1128 m = 0;
1124 1129
1130 // no, so do it the slow way
1125 if (!m) 1131 if (!m)
1126 { 1132 {
1127 nx = x; ny = y; m = plmap; 1133 nx = ob->x + dx; ny = ob->y + dy; m = ob->map;
1128 1134
1129 if (!xy_normalise (m, nx, ny)) 1135 if (xy_normalise (m, nx, ny))
1136 m->touch ();
1137 else
1130 m = 0; 1138 m = 0;
1131 } 1139 }
1140
1141 int ax = dx + hx;
1142 int ay = dy + hy;
1132 1143
1133 int emask, mask; 1144 int emask, mask;
1134 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1145 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1135 1146
1136 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1147 MapCell &lastcell = socket.lastmap.cells[ax][ay];
… …
1138 /* 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,
1139 * we tell the client as such 1150 * we tell the client as such
1140 */ 1151 */
1141 if (!m) 1152 if (!m)
1142 { 1153 {
1143 /* space is out of map. Update space and clear values 1154 /* space is out of map. Update space and clear values
1144 * 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
1145 * of the map, it shouldn't have a head 1156 * of the map, it shouldn't have a head.
1146 */ 1157 */
1147 if (lastcell.count != -1) 1158 if (lastcell.count != -1)
1148 { 1159 {
1149 sl << uint16 (mask); 1160 sl << uint16 (mask);
1150 map_clearcell (&lastcell, -1); 1161 map_clearcell (&lastcell, -1);
1151 } 1162 }
1152 1163
1153 continue; 1164 continue;
1154 } 1165 }
1155 1166
1156 m->touch ();
1157
1158 int d = pl->blocked_los[ax][ay]; 1167 int d = pl->blocked_los_uc (dx, dy);
1159 1168
1160 if (d > 3) 1169 if (d > 3)
1161 { 1170 {
1162
1163 int need_send = 0, count; 1171 int need_send = 0, count;
1164 1172
1165 /* This block deals with spaces that are not visible for whatever 1173 /* This block deals with spaces that are not visible for whatever
1166 * reason. Still may need to send the head for this space. 1174 * reason. Still may need to send the head for this space.
1167 */ 1175 */
… …
1173 if (lastcell.count != -1) 1181 if (lastcell.count != -1)
1174 need_send = 1; 1182 need_send = 1;
1175 1183
1176 count = -1; 1184 count = -1;
1177 1185
1178 /* properly clear a previously sent big face */
1179 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2] 1186 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1180 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1187 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1181 need_send = 1; 1188 need_send = 1;
1182 1189
1190 /* properly clear a previously sent big face */
1183 map_clearcell (&lastcell, count); 1191 map_clearcell (&lastcell, count);
1184 1192
1185 if ((mask & 0xf) || need_send) 1193 if ((mask & 0xf) || need_send)
1186 sl[oldlen + 1] = mask & 0xff; 1194 sl[oldlen + 1] = mask & 0xff;
1187 else 1195 else
… …
1237 uint8 flags = 0; 1245 uint8 flags = 0;
1238 tag_t player = 0; 1246 tag_t player = 0;
1239 1247
1240 // send hp information, if applicable 1248 // send hp information, if applicable
1241 if (object *op = ms.faces_obj [0]) 1249 if (object *op = ms.faces_obj [0])
1242 {
1243 if (op->head || op->invisible) 1250 if (op->is_head () && !op->invisible)
1244 ; // do not show
1245 else if (op->type == PLAYER
1246 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1247 { 1251 {
1248 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)))
1249 { 1259 {
1250 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1260 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1251 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
1252 } 1262 }
1253 }
1254 1263
1255 if (op->msg && op->msg[0] == '@') 1264 if (op->has_dialogue ())
1256 flags |= 1; 1265 flags |= 1;
1257 1266
1258 if (op->type == PLAYER && op != ob) 1267 if (op->type == PLAYER)
1259 player = op->count; 1268 player = op == ob ? pl->ob->count
1269 : op == pl->ob ? ob->count
1270 : op->count;
1260 } 1271 }
1261 1272
1262 if (lastcell.stat_hp != stat_hp) 1273 if (lastcell.stat_hp != stat_hp)
1263 { 1274 {
1264 lastcell.stat_hp = stat_hp; 1275 lastcell.stat_hp = stat_hp;
1265 1276
… …
1307 1318
1308 /* Middle face */ 1319 /* Middle face */
1309 if (update_space (sl, socket, ms, lastcell, 1)) 1320 if (update_space (sl, socket, ms, lastcell, 1))
1310 mask |= 0x2; 1321 mask |= 0x2;
1311 1322
1323 if (ob->invisible
1324 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1312 if (ms.player () == ob 1325 && ms.player () == ob)
1313 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1314 { 1326 {
1315 // force player to be visible to himself if invisible 1327 // force player to be visible to himself if invisible
1316 if (lastcell.faces[0] != ob->face) 1328 if (lastcell.faces[0] != ob->face)
1317 { 1329 {
1318 lastcell.faces[0] = ob->face; 1330 lastcell.faces[0] = ob->face;
… …
1414{ 1426{
1415 packet sl; 1427 packet sl;
1416 sl << "replyinfo skill_info\n"; 1428 sl << "replyinfo skill_info\n";
1417 1429
1418 for (int i = 1; i < NUM_SKILLS; i++) 1430 for (int i = 1; i < NUM_SKILLS; i++)
1419 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]);
1420 1432
1421 if (sl.length () >= MAXSOCKBUF) 1433 if (sl.length () > MAXSOCKBUF)
1422 { 1434 {
1423 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1435 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1424 fatal (0); 1436 fatal (0);
1425 } 1437 }
1426 1438
… …
1439 sl << "replyinfo spell_paths\n"; 1451 sl << "replyinfo spell_paths\n";
1440 1452
1441 for (int i = 0; i < NRSPELLPATHS; i++) 1453 for (int i = 0; i < NRSPELLPATHS; i++)
1442 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1454 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1443 1455
1444 if (sl.length () >= MAXSOCKBUF) 1456 if (sl.length () > MAXSOCKBUF)
1445 { 1457 {
1446 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1458 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1447 fatal (0); 1459 fatal (0);
1448 } 1460 }
1449 1461
… …
1468 if (spell->type == SPELL) 1480 if (spell->type == SPELL)
1469 { 1481 {
1470 int flags = 0; 1482 int flags = 0;
1471 1483
1472 /* check if we need to update it */ 1484 /* check if we need to update it */
1473 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))
1474 { 1486 {
1475 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);
1476 flags |= UPD_SP_MANA; 1488 flags |= UPD_SP_MANA;
1477 } 1489 }
1478 1490
1479 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))
1480 { 1492 {
1481 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);
1482 flags |= UPD_SP_GRACE; 1494 flags |= UPD_SP_GRACE;
1483 } 1495 }
1484 1496
1485 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))
1486 { 1498 {
1487 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);
1488 flags |= UPD_SP_DAMAGE; 1500 flags |= UPD_SP_DAMAGE;
1489 } 1501 }
1490 1502
1491 if (flags) 1503 if (flags)
1492 { 1504 {
… …
1494 1506
1495 sl << "updspell " 1507 sl << "updspell "
1496 << uint8 (flags) 1508 << uint8 (flags)
1497 << uint32 (spell->count); 1509 << uint32 (spell->count);
1498 1510
1499 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1511 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1500 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1512 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1501 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1513 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1502 1514
1503 pl->ns->send_packet (sl); 1515 pl->ns->send_packet (sl);
1504 } 1516 }
1505 } 1517 }
1506 } 1518 }
… …
1536 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);
1537 return; 1549 return;
1538 } 1550 }
1539 1551
1540 /* 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 */
1541 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);
1542 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);
1543 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);
1544 1556
1545 /* figure out which skill it uses, if it uses one */ 1557 /* figure out which skill it uses, if it uses one */
1546 if (spell->skill) 1558 if (spell->skill)
1547 { 1559 if (object *tmp = pl->find_skill (spell->skill))
1548 for (i = 1; i < NUM_SKILLS; i++)
1549 if (!strcmp (spell->skill, skill_names[i]))
1550 {
1551 skill = i + CS_STAT_SKILLINFO; 1560 skill = tmp->subtype + CS_STAT_SKILLINFO;
1552 break;
1553 }
1554 }
1555 1561
1556 // spells better have a face 1562 // spells better have a face
1557 if (!spell->face) 1563 if (!spell->face)
1558 { 1564 {
1559 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);
1560 spell->face = face_find ("burnout.x11", blank_face); 1566 spell->face = face_find ("burnout.x11", blank_face);
1561 } 1567 }
1568
1569 pl->ns->send_face (spell->face);
1562 1570
1563 /* send the current values */ 1571 /* send the current values */
1564 sl << uint32 (spell->count) 1572 sl << uint32 (spell->count)
1565 << uint16 (spell->level) 1573 << uint16 (spell->level)
1566 << uint16 (spell->casting_time) 1574 << uint16 (spell->casting_time)
1567 << uint16 (spell->last_sp) 1575 << uint16 (spell->cached_sp)
1568 << uint16 (spell->last_grace) 1576 << uint16 (spell->cached_grace)
1569 << uint16 (spell->last_eat) 1577 << uint16 (spell->cached_eat)
1570 << uint8 (skill) 1578 << uint8 (skill)
1571 << uint32 (spell->path_attuned) 1579 << uint32 (spell->path_attuned)
1572 << uint32 (spell->face) 1580 << uint32 (spell->face)
1573 << data8 (spell->name) 1581 << data8 (spell->name)
1574 << data16 (spell->msg); 1582 << data16 (spell->msg);
… …
1602 * 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
1603 * 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,
1604 * 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,
1605 * 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
1606 */ 1614 */
1615 if (spell->type != SPELL)
1616 continue;
1617
1607 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1618 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1608 * 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
1609 * 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
1610 * like it will fix this 1621 * like it will fix this
1611 */ 1622 */
1612 if (spell->type != SPELL)
1613 continue;
1614
1615 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))))
1616 { 1624 {
1625 pl->ns->flush_fx ();
1617 pl->ns->send_packet (sl); 1626 pl->ns->send_packet (sl);
1618 1627
1619 sl.reset (); 1628 sl.reset ();
1620 sl << "addspell "; 1629 sl << "addspell ";
1621 } 1630 }
… …
1629 return; 1638 return;
1630 } 1639 }
1631 else 1640 else
1632 append_spell (pl, sl, spell); 1641 append_spell (pl, sl, spell);
1633 1642
1634 if (sl.length () >= MAXSOCKBUF) 1643 if (sl.length () > MAXSOCKBUF)
1635 { 1644 {
1636 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1645 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1637 fatal (0); 1646 fatal (0);
1638 } 1647 }
1639 1648
1640 /* finally, we can send the packet */ 1649 /* finally, we can send the packet */
1650 pl->ns->flush_fx ();
1641 pl->ns->send_packet (sl); 1651 pl->ns->send_packet (sl);
1642} 1652}
1643 1653

Diff Legend

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