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.76 by root, Wed Mar 14 13:05:30 2007 UTC vs.
Revision 1.124 by root, Tue Apr 15 14:21:04 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2001 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program 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 2 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,
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 GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The author 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.
… …
130} 129}
131 130
132static void 131static void
133clear_map (player *pl) 132clear_map (player *pl)
134{ 133{
134 pl->ns->mapinfo_queue_clear ();
135
135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 136 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
137
138 pl->ns->force_newmap = false;
136 139
137 if (pl->ns->newmapcmd == 1) 140 if (pl->ns->newmapcmd == 1)
138 pl->ns->send_packet ("newmap"); 141 pl->ns->send_packet ("newmap");
139 142
140 pl->ns->floorbox_reset (); 143 pl->ns->floorbox_reset ();
… …
143/** check for map/region change and send new map data */ 146/** check for map/region change and send new map data */
144static void 147static void
145check_map_change (player *pl) 148check_map_change (player *pl)
146{ 149{
147 client &socket = *pl->ns; 150 client &socket = *pl->ns;
148 object *ob = pl->ob; 151 object *ob = pl->observe;
149 char buf[MAX_BUF]; /* eauugggh */
150 152
151 if (socket.current_map != ob->map) 153 if (socket.current_map != ob->map || socket.force_newmap)
152 { 154 {
155 clear_map (pl);
153 socket.current_map = ob->map; 156 socket.current_map = ob->map;
154
155 clear_map (pl);
156 157
157 if (socket.mapinfocmd) 158 if (socket.mapinfocmd)
158 { 159 {
159 if (ob->map && ob->map->path[0]) 160 if (ob->map && ob->map->path[0])
160 { 161 {
161 int flags = 0; 162 int flags = 0;
162 163
163 if (ob->map->tile_path[0]) 164 if (ob->map->tile_path[0]) flags |= 1;
164 flags |= 1;
165 if (ob->map->tile_path[1]) 165 if (ob->map->tile_path[1]) flags |= 2;
166 flags |= 2;
167 if (ob->map->tile_path[2]) 166 if (ob->map->tile_path[2]) flags |= 4;
168 flags |= 4;
169 if (ob->map->tile_path[3]) 167 if (ob->map->tile_path[3]) flags |= 8;
170 flags |= 8;
171 168
172 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 169 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
173 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path); 170 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
171 ob->map->width, ob->map->height, &ob->map->path);
174 } 172 }
175 else 173 else
176 snprintf (buf, MAX_BUF, "mapinfo current");
177
178 socket.send_packet (buf); 174 socket.send_packet ("mapinfo current");
179 } 175 }
180 } 176 }
181 else if (socket.current_x != ob->x || socket.current_y != ob->y) 177 else if (socket.current_x != ob->x || socket.current_y != ob->y)
182 { 178 {
183 int dx = ob->x - socket.current_x; 179 int dx = ob->x - socket.current_x;
… …
196 socket.current_y = ob->y; 192 socket.current_y = ob->y;
197 193
198 region *reg = ob->region (); 194 region *reg = ob->region ();
199 if (socket.current_region != reg) 195 if (socket.current_region != reg)
200 { 196 {
197 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
201 socket.current_region = reg; 198 socket.current_region = reg;
202 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
203 } 199 }
204} 200}
205 201
206/** 202/**
207 * RequestInfo is sort of a meta command. There is some specific 203 * RequestInfo is sort of a meta command. There is some specific
208 * request of information, but we call other functions to provide 204 * request of information, but we call other functions to provide
209 * that information. 205 * that information.
210 */ 206 */
211void 207void
212RequestInfo (char *buf, int len, client * ns) 208RequestInfo (char *buf, int len, client *ns)
213{ 209{
214 char *params = NULL, *cp; 210 char *params;
215
216 /* No match */
217 char bigbuf[MAX_BUF];
218 int slen;
219
220 /* Set up replyinfo before we modify any of the buffers - this is used
221 * if we don't find a match.
222 */
223 strcpy (bigbuf, "replyinfo ");
224 slen = strlen (bigbuf);
225 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
226 211
227 /* find the first space, make it null, and update the 212 /* find the first space, make it null, and update the
228 * params pointer. 213 * params pointer.
229 */ 214 */
230 for (cp = buf; *cp != '\0'; cp++) 215 for (params = buf; *params; params++)
231 if (*cp == ' ') 216 if (*params == ' ')
232 { 217 {
233 *cp = '\0';
234 params = cp + 1; 218 *params++ = 0;
235 break; 219 break;
236 } 220 }
237 221
238 if (!strcmp (buf, "image_info")) 222 if (!strcmp (buf, "image_info"))
239 send_image_info (ns, params); 223 send_image_info (ns, params);
… …
242 else if (!strcmp (buf, "skill_info")) 226 else if (!strcmp (buf, "skill_info"))
243 send_skill_info (ns, params); 227 send_skill_info (ns, params);
244 else if (!strcmp (buf, "spell_paths")) 228 else if (!strcmp (buf, "spell_paths"))
245 send_spell_paths (ns, params); 229 send_spell_paths (ns, params);
246 else 230 else
247 ns->send_packet (bigbuf, len); 231 {
232 // undo tokenisation above and send replyinfo with the request unchanged
233 if (*params)
234 *--params = ' ';
235
236 ns->send_packet_printf ("replyinfo %s", buf);
237 }
248} 238}
249 239
250void 240void
251ExtCmd (char *buf, int len, player *pl) 241ExtCmd (char *buf, int len, player *pl)
252{ 242{
… …
255 245
256void 246void
257ExtiCmd (char *buf, int len, client *ns) 247ExtiCmd (char *buf, int len, client *ns)
258{ 248{
259 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 249 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
250}
251
252void
253client::mapinfo_queue_clear ()
254{
255 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
256 free (*i);
257
258 mapinfo_queue.clear ();
259}
260
261bool
262client::mapinfo_try (char *buf)
263{
264 char *token = buf;
265 buf += strlen (buf) + 9;
266
267 // initial map and its origin
268 maptile *map = pl->observe->map;
269 int mapx = pl->ns->mapx / 2 - pl->observe->x;
270 int mapy = pl->ns->mapy / 2 - pl->observe->y;
271 int max_distance = 8; // limit maximum path length to something generous
272
273 while (*buf && map && max_distance)
274 {
275 int dir = *buf++ - '1';
276
277 if (dir >= 0 && dir <= 3)
278 {
279 if (!map->tile_path [dir])
280 map = 0;
281 else if (map->tile_available (dir, false))
282 {
283 maptile *neigh = map->tile_map [dir];
284
285 switch (dir)
286 {
287 case 0: mapy -= neigh->height; break;
288 case 2: mapy += map ->height; break;
289 case 3: mapx -= neigh->width ; break;
290 case 1: mapx += map ->width ; break;
291 }
292
293 map = neigh;
294 --max_distance;
295 }
296 else
297 return 0;
298 }
299 else
300 max_distance = 0;
301 }
302
303 if (!max_distance)
304 send_packet_printf ("mapinfo %s error", token);
305 else if (!map || !map->path)
306 send_packet_printf ("mapinfo %s nomap", token);
307 else
308 {
309 int flags = 0;
310
311 if (map->tile_path[0]) flags |= 1;
312 if (map->tile_path[1]) flags |= 2;
313 if (map->tile_path[2]) flags |= 4;
314 if (map->tile_path[3]) flags |= 8;
315
316 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
317 }
318
319 return 1;
320}
321
322void
323client::mapinfo_queue_run ()
324{
325 if (mapinfo_queue.empty () || !pl)
326 return;
327
328 for (int i = 0; i < mapinfo_queue.size (); ++i)
329 if (mapinfo_try (mapinfo_queue [i]))
330 {
331 free (mapinfo_queue [i]);
332 mapinfo_queue.erase (i);
333 }
334 else
335 ++i;
260} 336}
261 337
262void 338void
263MapInfoCmd (char *buf, int len, player *pl) 339MapInfoCmd (char *buf, int len, player *pl)
264{ 340{
265 // <mapinfo tag spatial tile-path 341 // <mapinfo tag spatial tile-path
266 // >mapinfo tag spatial flags x y w h hash 342 // >mapinfo tag spatial flags x y w h hash
267 343
268 char bigbuf[MAX_BUF], *token;
269
270 token = buf; 344 char *token = buf;
271 // copy token 345
272 if (!(buf = strchr (buf, ' '))) 346 if (!(buf = strchr (buf, ' ')))
273 return; 347 return;
274 348
275 *buf++ = 0;
276
277 if (!strncmp (buf, "spatial ", 8)) 349 if (!strncmp (buf, " spatial ", 9))
278 { 350 {
279 buf += 8; 351 char *copy = strdup (token);
352 copy [buf - token] = 0;
280 353
281 // initial map and its origin 354#if 0
282 maptile *map = pl->ob->map; 355 // this makes only sense when we flush the buffer immediately
283 sint16 dx, dy; 356 if (pl->ns->mapinfo_try (copy))
284 int mapx = pl->ns->mapx / 2 - pl->ob->x; 357 free (copy);
285 int mapy = pl->ns->mapy / 2 - pl->ob->y;
286 int max_distance = 8; // limit maximum path length to something generous
287
288 while (*buf && map && max_distance)
289 {
290 int dir = *buf++;
291
292 switch (dir)
293 {
294 case '1':
295 dx = 0;
296 dy = -1;
297 map = map->xy_find (dx, dy);
298 map && (mapy -= map->height);
299 break;
300 case '2':
301 mapx += map->width;
302 dx = map->width;
303 dy = 0;
304 map = map->xy_find (dx, dy);
305 break;
306 case '3':
307 mapy += map->height;
308 dx = 0;
309 dy = map->height;
310 map = map->xy_find (dx, dy);
311 break;
312 case '4':
313 dx = -1;
314 dy = 0;
315 map = map->xy_find (dx, dy);
316 map && (mapx -= map->width);
317 break;
318 }
319
320 --max_distance;
321 }
322
323 if (!max_distance)
324 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
325 else if (map && map->path[0])
326 {
327 int flags = 0;
328
329 if (map->tile_path[0])
330 flags |= 1;
331 if (map->tile_path[1])
332 flags |= 2;
333 if (map->tile_path[2])
334 flags |= 4;
335 if (map->tile_path[3])
336 flags |= 8;
337
338 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
339 }
340 else 358 else
341 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 359#endif
360 pl->ns->mapinfo_queue.push_back (copy);
342 } 361 }
343 else 362 else
344 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 363 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
345
346 pl->ns->send_packet (bigbuf);
347} 364}
348 365
349/** This is the Setup cmd - easy first implementation */ 366/** This is the Setup cmd */
350void 367void
351SetUp (char *buf, int len, client * ns) 368SetUp (char *buf, int len, client * ns)
352{ 369{
353 int s, slen; 370 INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
354 char *cmd, *param, cmdback[HUGE_BUF];
355
356 /* run through the cmds of setup
357 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
358 *
359 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
360 * The client then must sort this out
361 */
362
363 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
364
365 strcpy (cmdback, "setup");
366 for (s = 0; s < len; )
367 {
368 cmd = &buf[s];
369
370 /* find the next space, and put a null there */
371 for (; buf[s] && buf[s] != ' '; s++)
372 ;
373
374 buf[s++] = 0;
375
376 while (buf[s] == ' ')
377 s++;
378
379 if (s >= len)
380 break;
381
382 param = &buf[s];
383
384 for (; buf[s] && buf[s] != ' '; s++)
385 ;
386
387 buf[s++] = 0;
388
389 while (buf[s] == ' ')
390 s++;
391
392 slen = strlen (cmdback);
393 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
394 safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
395 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
396
397 if (!strcmp (cmd, "sound"))
398 {
399 ns->sound = atoi (param);
400 safe_strcat (cmdback, param, &slen, HUGE_BUF);
401 }
402 else if (!strcmp (cmd, "exp64"))
403 safe_strcat (cmdback, param, &slen, HUGE_BUF);
404 else if (!strcmp (cmd, "spellmon"))
405 {
406 ns->monitor_spells = atoi (param);
407 safe_strcat (cmdback, param, &slen, HUGE_BUF);
408 }
409 else if (!strcmp (cmd, "darkness"))
410 {
411 ns->darkness = atoi (param);
412 safe_strcat (cmdback, param, &slen, HUGE_BUF);
413 }
414 else if (!strcmp (cmd, "map1cmd"))
415 {
416 if (atoi (param))
417 ns->mapmode = Map1Cmd;
418 /* if beyond this size, need to use map1cmd no matter what */
419 if (ns->mapx > 11 || ns->mapy > 11)
420 ns->mapmode = Map1Cmd;
421 safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
422 }
423 else if (!strcmp (cmd, "map1acmd"))
424 {
425 if (atoi (param))
426 ns->mapmode = Map1aCmd;
427 /* if beyond this size, need to use map1acmd no matter what */
428 if (ns->mapx > 11 || ns->mapy > 11)
429 ns->mapmode = Map1aCmd;
430 safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
431 }
432 else if (!strcmp (cmd, "newmapcmd"))
433 {
434 ns->newmapcmd = atoi (param);
435 safe_strcat (cmdback, param, &slen, HUGE_BUF);
436 }
437 else if (!strcmp (cmd, "mapinfocmd"))
438 {
439 ns->mapinfocmd = atoi (param);
440 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
441 }
442 else if (!strcmp (cmd, "extcmd"))
443 {
444 ns->extcmd = atoi (param);
445 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
446 }
447 else if (!strcmp (cmd, "extmap"))
448 {
449 ns->extmap = atoi (param);
450 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
451 }
452 else if (!strcmp (cmd, "facecache"))
453 {
454 ns->facecache = atoi (param);
455 safe_strcat (cmdback, param, &slen, HUGE_BUF);
456 }
457 else if (!strcmp (cmd, "faceset"))
458 {
459 char tmpbuf[20];
460 int q = atoi (param);
461
462 if (is_valid_faceset (q))
463 ns->faceset = q;
464
465 sprintf (tmpbuf, "%d", ns->faceset);
466 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
467 /* if the client is using faceset, it knows about image2 command */
468 ns->image2 = 1;
469 }
470 else if (!strcmp (cmd, "itemcmd"))
471 {
472 /* Version of the item protocol command to use. Currently,
473 * only supported versions are 1 and 2. Using a numeric
474 * value will make it very easy to extend this in the future.
475 */
476 char tmpbuf[20];
477 int q = atoi (param);
478
479 if (q < 1 || q > 2)
480 {
481 strcpy (tmpbuf, "FALSE");
482 }
483 else
484 {
485 ns->itemcmd = q;
486 sprintf (tmpbuf, "%d", ns->itemcmd);
487 }
488 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
489 }
490 else if (!strcmp (cmd, "mapsize"))
491 {
492 int x, y = 0;
493 char tmpbuf[MAX_BUF], *cp;
494
495 x = atoi (param);
496 for (cp = param; *cp != 0; cp++)
497 if (*cp == 'x' || *cp == 'X')
498 {
499 y = atoi (cp + 1);
500 break;
501 }
502
503 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
504 {
505 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
506 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
507 }
508 else
509 {
510 ns->mapx = x;
511 ns->mapy = y;
512 /* better to send back what we are really using and not the
513 * param as given to us in case it gets parsed differently.
514 */
515 sprintf (tmpbuf, "%dx%d", x, y);
516 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
517 /* If beyond this size and still using orig map command, need to
518 * go to map1cmd.
519 */
520 if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
521 ns->mapmode = Map1Cmd;
522 }
523 }
524 else if (!strcmp (cmd, "extendedMapInfos"))
525 {
526 /* Added by tchize
527 * prepare to use the mapextended command
528 */
529 char tmpbuf[20];
530
531 ns->ext_mapinfos = (atoi (param));
532 sprintf (tmpbuf, "%d", ns->ext_mapinfos);
533 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
534 }
535 else if (!strcmp (cmd, "extendedTextInfos"))
536 {
537 /* Added by tchize
538 * prepare to use the extended text commands
539 * Client toggle this to non zero to get exttext
540 */
541 char tmpbuf[20];
542
543 ns->has_readable_type = (atoi (param));
544 sprintf (tmpbuf, "%d", ns->has_readable_type);
545 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
546 }
547 else
548 {
549 /* Didn't get a setup command we understood -
550 * report a failure to the client.
551 */
552 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
553 }
554 } /* for processing all the setup commands */
555
556 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
557 ns->send_packet (cmdback);
558} 371}
559 372
560/** 373/**
561 * The client has requested to be added to the game. 374 * The client has requested to be added to the game.
562 * This is what takes care of it. We tell the client how things worked out. 375 * This is what takes care of it. We tell the client how things worked out.
563 * I am not sure if this file is the best place for this function. however, 376 * I am not sure if this file is the best place for this function. however,
564 * it either has to be here or init_sockets needs to be exported. 377 * it either has to be here or init_sockets needs to be exported.
565 */ 378 */
566void 379void
567AddMeCmd (char *buf, int len, client * ns) 380AddMeCmd (char *buf, int len, client *ns)
568{ 381{
569 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 382 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
570} 383}
571 384
572/** Reply to ExtendedInfos command */ 385/** Reply to ExtendedInfos command */
… …
684 497
685 ns->send_packet (cmdback); 498 ns->send_packet (cmdback);
686} 499}
687 500
688/** 501/**
689 * Tells client the picture it has to use
690 * to smooth a picture number given as argument.
691 */
692void
693AskSmooth (char *buf, int len, client *ns)
694{
695 ns->send_face (atoi (buf));
696}
697
698/**
699 * This handles the general commands from the client (ie, north, fire, cast, 502 * This handles the general commands from the client (ie, north, fire, cast,
700 * etc.) 503 * etc.)
701 */ 504 */
702void 505void
703PlayerCmd (char *buf, int len, player *pl) 506PlayerCmd (char *buf, int len, player *pl)
… …
724 * commands. 527 * commands.
725 */ 528 */
726 pl->count = 0; 529 pl->count = 0;
727} 530}
728 531
729
730/** 532/**
731 * This handles the general commands from the client (ie, north, fire, cast, 533 * This handles the general commands from the client (ie, north, fire, cast,
732 * etc.). It is a lot like PlayerCmd above, but is called with the 534 * etc.). It is a lot like PlayerCmd above, but is called with the
733 * 'ncom' method which gives more information back to the client so it 535 * 'ncom' method which gives more information back to the client so it
734 * can throttle. 536 * can throttle.
… …
736void 538void
737NewPlayerCmd (char *buf, int len, player *pl) 539NewPlayerCmd (char *buf, int len, player *pl)
738{ 540{
739 if (len <= 6) 541 if (len <= 6)
740 { 542 {
741 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 543 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
742 return; 544 return;
743 } 545 }
744 546
745 uint16 cmdid = net_uint16 ((uint8 *)buf); 547 uint16 cmdid = net_uint16 ((uint8 *)buf);
746 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 548 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
803 { 605 {
804 case ST_PLAYING: 606 case ST_PLAYING:
805 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 607 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
806 break; 608 break;
807 609
808 case ST_CHANGE_CLASS:
809 key_change_class (pl->ob, buf[0]);
810 break;
811
812 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 610 case ST_GET_PARTY_PASSWORD: /* Get password for party */
813 receive_party_password (pl->ob, 13); 611 receive_party_password (pl->ob, 13);
814 break; 612 break;
815 613
816 default: 614 default:
… …
855 653
856 cp = strchr (cp + 1, ' '); 654 cp = strchr (cp + 1, ' ');
857 655
858 if (cp) 656 if (cp)
859 { 657 {
860 assign (ns->version, cp + 1); 658 ns->version = cp + 1;
861 659
862 if (ns->sc_version < 1026) 660 if (ns->sc_version < 1026)
863 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 661 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
864 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 662 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
865 } 663 }
… …
925/** 723/**
926 * Asks the client to query the user. This way, the client knows 724 * Asks the client to query the user. This way, the client knows
927 * it needs to send something back (vs just printing out a message) 725 * it needs to send something back (vs just printing out a message)
928 */ 726 */
929void 727void
930send_query (client *ns, uint8 flags, char *text) 728send_query (client *ns, uint8 flags, const char *text)
931{ 729{
932 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 730 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
731}
732
733/**
734 * Get player's current range attack in obuf.
735 */
736static void
737rangetostring (player *pl, char *obuf)
738{
739 dynbuf_text buf;
740
741 if (pl->ranged_ob)
742 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
743
744 if (pl->combat_ob)
745 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
746
747#if 0
748 //TODO: remove this when slot system is working, this is only for debugging
749 if (pl->ob->chosen_skill)
750 buf << " Skill*: " << pl->ob->chosen_skill->name;
751#endif
752
753 //TODO: maybe golem should become the current_weapon, quite simply?
754 if (pl->golem)
755 buf << " Golem*: " << pl->golem->name;
756
757 buf << '\0';
758 buf.linearise (obuf);
933} 759}
934 760
935#define AddIfInt64(Old,New,Type) if (Old != New) {\ 761#define AddIfInt64(Old,New,Type) if (Old != New) {\
936 Old = New; \ 762 Old = New; \
937 sl << uint8 (Type) << uint64 (New); \ 763 sl << uint8 (Type) << uint64 (New); \
… …
945#define AddIfShort(Old,New,Type) if (Old != New) {\ 771#define AddIfShort(Old,New,Type) if (Old != New) {\
946 Old = New; \ 772 Old = New; \
947 sl << uint8 (Type) << uint16 (New); \ 773 sl << uint8 (Type) << uint16 (New); \
948 } 774 }
949 775
950#define AddIfFloat(Old,New,Type) if (Old != New) {\ 776#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
951 Old = New; \ 777 Old = New; \
952 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 778 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
953 } 779 }
954 780
955#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 781#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
956 free(Old); Old = strdup (New);\ 782 free(Old); Old = strdup (New);\
957 sl << uint8 (Type) << data8 (New); \ 783 sl << uint8 (Type) << data8 (New); \
… …
971 797
972 client *ns = pl->ns; 798 client *ns = pl->ns;
973 if (!ns) 799 if (!ns)
974 return; 800 return;
975 801
976 object *ob = pl->ob; 802 object *ob = pl->observe;
977 if (!ob) 803 if (!ob)
978 return; 804 return;
805
806 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
979 807
980 packet sl ("stats"); 808 packet sl ("stats");
981 809
982 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 810 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
983 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 811 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
992 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 820 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
993 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 821 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
994 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 822 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
995 823
996 for (int s = 0; s < NUM_SKILLS; s++) 824 for (int s = 0; s < NUM_SKILLS; s++)
997 if (object *skill = pl->last_skill_ob[s]) 825 if (object *skill = opl->last_skill_ob[s])
998 if (skill->stats.exp != ns->last_skill_exp [s]) 826 if (skill->stats.exp != ns->last_skill_exp [s])
999 { 827 {
1000 ns->last_skill_exp [s] = skill->stats.exp; 828 ns->last_skill_exp [s] = skill->stats.exp;
1001 829
1002 /* Always send along the level if exp changes. This is only 830 /* Always send along the level if exp changes. This is only
… …
1010 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 838 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1011 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 839 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1012 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 840 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1013 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 841 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1014 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 842 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1015 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 843 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1016 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 844 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1017 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 845 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
1018 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 846 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1019 847
1020 flags = 0; 848 flags = 0;
1021 849
1022 if (pl->fire_on) 850 if (opl->fire_on)
1023 flags |= SF_FIREON; 851 flags |= SF_FIREON;
1024 852
1025 if (pl->run_on) 853 if (opl->run_on)
1026 flags |= SF_RUNON; 854 flags |= SF_RUNON;
1027 855
1028 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 856 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1029 857
1030 if (ns->sc_version < 1025) 858 if (ns->sc_version < 1025)
… …
1044 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 872 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1045 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 873 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1046 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 874 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1047 } 875 }
1048 876
1049 rangetostring (ob, buf); /* we want use the new fire & run system in new client */ 877 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
1050 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 878 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1051 set_title (ob, buf); 879 set_title (ob, buf);
1052 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 880 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1053 881
1054 /* Only send it away if we have some actual data */ 882 /* Only send it away if we have some actual data */
… …
1136 964
1137 if (!ns.faces_sent[face_num]) 965 if (!ns.faces_sent[face_num])
1138 if (ob) 966 if (ob)
1139 ns.send_faces (ob); 967 ns.send_faces (ob);
1140 else 968 else
1141 ns.send_face (face_num); 969 ns.send_face (face_num, 10);
1142 970
1143 sl << uint16 (face_num); 971 sl << uint16 (face_num);
1144 return 1; 972 return 1;
1145 } 973 }
1146 974
… …
1188{ 1016{
1189 prefetch_surrounding_maps (op->map, 3); 1017 prefetch_surrounding_maps (op->map, 3);
1190} 1018}
1191 1019
1192/** 1020/**
1193 * This function uses the new map1 protocol command to send the map 1021 * Draws client map.
1194 * to the client. It is necessary because the old map command supports
1195 * a maximum map size of 15x15.
1196 * This function is much simpler than the old one. This is because
1197 * the old function optimized to send as few face identifiers as possible,
1198 * at the expense of sending more coordinate location (coordinates were
1199 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1200 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1201 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1202 * and use the other 4 bits for other informatiion. For full documentation
1203 * of what we send, see the doc/Protocol file.
1204 * I will describe internally what we do:
1205 * the ns->lastmap shows how the map last looked when sent to the client.
1206 * in the lastmap structure, there is a cells array, which is set to the
1207 * maximum viewable size (As set in config.h).
1208 * in the cells, there are faces and a count value.
1209 * we use the count value to hold the darkness value. If -1, then this space
1210 * is not viewable.
1211 * we use faces[0] faces[1] faces[2] to hold what the three layers
1212 * look like.
1213 */ 1022 */
1214void 1023void
1215draw_client_map1 (object *pl) 1024draw_client_map (player *pl)
1216{ 1025{
1026 object *ob = pl->observe;
1027 if (!ob->active)
1028 return;
1029
1030 maptile *plmap = ob->map;
1031
1032 /* If player is just joining the game, he isn't here yet, so the map
1033 * can get swapped out. If so, don't try to send them a map. All will
1034 * be OK once they really log in.
1035 */
1036 if (!plmap || plmap->in_memory != MAP_ACTIVE)
1037 return;
1038
1217 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1039 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1218 sint16 nx, ny;
1219 int estartlen, eoldlen; 1040 int estartlen, eoldlen;
1220 uint8 eentrysize; 1041 uint8 eentrysize;
1221 uint16 ewhatstart, ewhatflag; 1042 uint16 ewhatstart, ewhatflag;
1222 uint8 extendedinfos; 1043 uint8 extendedinfos;
1223 maptile *m;
1224 1044
1225 client &socket = *pl->contr->ns;
1226
1227 if (!pl->active)
1228 return;
1229
1230 check_map_change (pl->contr); 1045 check_map_change (pl);
1231 prefetch_surrounding_maps (pl); 1046 prefetch_surrounding_maps (pl->ob);
1047
1048 /* do LOS after calls to update_position */
1049 if (ob != pl->ob)
1050 clear_los (pl);
1051 else if (pl->do_los)
1052 {
1053 update_los (ob);
1054 pl->do_los = 0;
1055 }
1056
1057 /**
1058 * This function uses the new map1 protocol command to send the map
1059 * to the client. It is necessary because the old map command supports
1060 * a maximum map size of 15x15.
1061 * This function is much simpler than the old one. This is because
1062 * the old function optimized to send as few face identifiers as possible,
1063 * at the expense of sending more coordinate location (coordinates were
1064 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1065 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1066 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1067 * and use the other 4 bits for other informatiion. For full documentation
1068 * of what we send, see the doc/Protocol file.
1069 * I will describe internally what we do:
1070 * the ns->lastmap shows how the map last looked when sent to the client.
1071 * in the lastmap structure, there is a cells array, which is set to the
1072 * maximum viewable size (As set in config.h).
1073 * in the cells, there are faces and a count value.
1074 * we use the count value to hold the darkness value. If -1, then this space
1075 * is not viewable.
1076 * we use faces[0] faces[1] faces[2] to hold what the three layers
1077 * look like.
1078 */
1079
1080 client &socket = *pl->ns;
1232 1081
1233 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1082 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1234 packet esl; 1083 packet esl;
1235 1084
1236 startlen = sl.length (); 1085 startlen = sl.length ();
… …
1251 << uint8 (extendedinfos) 1100 << uint8 (extendedinfos)
1252 << uint8 (eentrysize); 1101 << uint8 (eentrysize);
1253 1102
1254 estartlen = esl.length (); 1103 estartlen = esl.length ();
1255 } 1104 }
1256 else
1257 {
1258 /* suppress compiler warnings */
1259 ewhatstart = 0;
1260 ewhatflag = 0;
1261 estartlen = 0;
1262 }
1263 1105
1264 /* x,y are the real map locations. ax, ay are viewport relative 1106 /* x,y are the real map locations. ax, ay are viewport relative
1265 * locations. 1107 * locations.
1266 */ 1108 */
1267 ay = 0; 1109 ay = 0;
1268 1110
1269 /* We could do this logic as conditionals in the if statement, 1111 /* We could do this logic as conditionals in the if statement,
1270 * but that started to get a bit messy to look at. 1112 * but that started to get a bit messy to look at.
1271 */ 1113 */
1272 max_x = pl->x + (socket.mapx + 1) / 2; 1114 max_x = ob->x + (socket.mapx + 1) / 2;
1273 max_y = pl->y + (socket.mapy + 1) / 2; 1115 max_y = ob->y + (socket.mapy + 1) / 2;
1274 1116
1275 maptile *plmap = pl->map;
1276
1277 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1117 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1278 { 1118 {
1119 sint16 nx, ny;
1120 maptile *m = 0;
1121
1279 ax = 0; 1122 ax = 0;
1280 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1123 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1281 { 1124 {
1125 // check to see if we can simply go one right quickly
1126 ++nx;
1127 if (m && nx >= m->width)
1128 m = 0;
1129
1130 if (!m)
1131 {
1132 nx = x; ny = y; m = plmap;
1133
1134 if (xy_normalise (m, nx, ny))
1135 m->touch ();
1136 else
1137 m = 0;
1138 }
1139
1282 int emask, mask; 1140 int emask, mask;
1283 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1141 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1284 1142
1285 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1143 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1286 1144
1287 /* If the coordinates are not valid, or it is too dark to see, 1145 /* If the coordinates are not valid, or it is too dark to see,
1288 * we tell the client as such 1146 * we tell the client as such
1289 */ 1147 */
1290 nx = x;
1291 ny = y;
1292 m = get_map_from_coord (plmap, &nx, &ny);
1293
1294 if (!m) 1148 if (!m)
1295 { 1149 {
1296 /* space is out of map. Update space and clear values 1150 /* space is out of map. Update space and clear values
1297 * if this hasn't already been done. If the space is out 1151 * if this hasn't already been done. If the space is out
1298 * of the map, it shouldn't have a head 1152 * of the map, it shouldn't have a head
… …
1304 } 1158 }
1305 1159
1306 continue; 1160 continue;
1307 } 1161 }
1308 1162
1309 m->touch ();
1310
1311 int d = pl->contr->blocked_los[ax][ay]; 1163 int d = pl->blocked_los[ax][ay];
1312 1164
1313 if (d > 3) 1165 if (d > 3)
1314 { 1166 {
1315 1167
1316 int need_send = 0, count; 1168 int need_send = 0, count;
… …
1379 } 1231 }
1380 1232
1381 lastcell.count = d; 1233 lastcell.count = d;
1382 1234
1383 mapspace &ms = m->at (nx, ny); 1235 mapspace &ms = m->at (nx, ny);
1236 ms.update ();
1384 1237
1385 if (socket.extmap) 1238 if (socket.extmap)
1386 { 1239 {
1387 uint8 stat_hp = 0; 1240 uint8 stat_hp = 0;
1388 uint8 stat_width = 0; 1241 uint8 stat_width = 0;
1389 uint8 flags = 0; 1242 uint8 flags = 0;
1390 UUID player = 0; 1243 tag_t player = 0;
1391 1244
1392 // send hp information, if applicable 1245 // send hp information, if applicable
1393 if (object *op = ms.faces_obj [0]) 1246 if (object *op = ms.faces_obj [0])
1394 { 1247 {
1395 if (op->head || op->invisible) 1248 if (op->head || op->invisible)
… …
1398 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1251 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1399 { 1252 {
1400 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) 1253 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1401 { 1254 {
1402 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1255 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1403 stat_width = op->arch->tail_x; 1256 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1404 } 1257 }
1405 } 1258 }
1406 1259
1407 if (op->msg && op->msg[0] == '@') 1260 if (op->msg && op->msg[0] == '@')
1408 flags |= 1; 1261 flags |= 1;
1409 1262
1410 if (op->type == PLAYER && op != pl) 1263 if (op->type == PLAYER && op != ob)
1411 player = op->count; 1264 player = op->count;
1412 } 1265 }
1413 1266
1414 if (lastcell.stat_hp != stat_hp) 1267 if (lastcell.stat_hp != stat_hp)
1415 { 1268 {
… …
1436 1289
1437 mask |= 0x8; 1290 mask |= 0x8;
1438 *last_ext |= 0x80; 1291 *last_ext |= 0x80;
1439 last_ext = &sl[sl.length ()]; 1292 last_ext = &sl[sl.length ()];
1440 1293
1441 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1294 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1442 } 1295 }
1443 1296
1444 if (lastcell.flags != flags) 1297 if (lastcell.flags != flags)
1445 { 1298 {
1446 lastcell.flags = flags; 1299 lastcell.flags = flags;
… …
1459 1312
1460 /* Middle face */ 1313 /* Middle face */
1461 if (update_space (sl, socket, ms, lastcell, 1)) 1314 if (update_space (sl, socket, ms, lastcell, 1))
1462 mask |= 0x2; 1315 mask |= 0x2;
1463 1316
1464 if (ms.player () == pl 1317 if (ms.player () == ob
1465 && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) 1318 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1466 { 1319 {
1467 // force player to be visible to himself if invisible 1320 // force player to be visible to himself if invisible
1468 if (lastcell.faces[0] != pl->face) 1321 if (lastcell.faces[0] != ob->face)
1469 { 1322 {
1470 lastcell.faces[0] = pl->face; 1323 lastcell.faces[0] = ob->face;
1471 1324
1472 mask |= 0x1; 1325 mask |= 0x1;
1473 sl << uint16 (pl->face); 1326 sl << uint16 (ob->face);
1474 1327
1475 socket.send_faces (pl); 1328 socket.send_faces (ob);
1476 } 1329 }
1477 } 1330 }
1478 /* Top face */ 1331 /* Top face */
1479 else if (update_space (sl, socket, ms, lastcell, 0)) 1332 else if (update_space (sl, socket, ms, lastcell, 0))
1480 mask |= 0x1; 1333 mask |= 0x1;
1481
1482 1334
1483 /* Check to see if we are in fact sending anything for this 1335 /* Check to see if we are in fact sending anything for this
1484 * space by checking the mask. If so, update the mask. 1336 * space by checking the mask. If so, update the mask.
1485 * if not, reset the len to that from before adding the mask 1337 * if not, reset the len to that from before adding the mask
1486 * value, so we don't send those bits. 1338 * value, so we don't send those bits.
… …
1520 } 1372 }
1521 } /* else this is a viewable space */ 1373 } /* else this is a viewable space */
1522 } /* for x loop */ 1374 } /* for x loop */
1523 } /* for y loop */ 1375 } /* for y loop */
1524 1376
1377 socket.flush_fx ();
1378
1525 /* Verify that we in fact do need to send this */ 1379 /* Verify that we in fact do need to send this */
1526 if (socket.ext_mapinfos) 1380 if (socket.ext_mapinfos)
1527 { 1381 {
1528 if (!(sl.length () > startlen || socket.sent_scroll)) 1382 if (!(sl.length () > startlen || socket.sent_scroll))
1529 { 1383 {
… …
1543 socket.send_packet (sl); 1397 socket.send_packet (sl);
1544 socket.sent_scroll = 0; 1398 socket.sent_scroll = 0;
1545 } 1399 }
1546} 1400}
1547 1401
1548/**
1549 * Draws client map.
1550 */
1551void
1552draw_client_map (object *pl)
1553{
1554 int i, j;
1555 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1556 int mflags;
1557 struct Map newmap;
1558 maptile *m, *pm;
1559
1560 if (pl->type != PLAYER)
1561 {
1562 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1563 return;
1564 }
1565
1566 pm = pl->map;
1567
1568 /* If player is just joining the game, he isn't here yet, so the map
1569 * can get swapped out. If so, don't try to send them a map. All will
1570 * be OK once they really log in.
1571 */
1572 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1573 return;
1574
1575 memset (&newmap, 0, sizeof (struct Map));
1576
1577 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1578 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1579 {
1580 ax = i;
1581 ay = j;
1582 m = pm;
1583 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1584
1585 if (mflags & P_OUT_OF_MAP)
1586 continue;
1587
1588 /* If a map is visible to the player, we don't want to swap it out
1589 * just to reload it. This should really call something like
1590 * swap_map, but this is much more efficient and 'good enough'
1591 */
1592 if (mflags & P_NEW_MAP)
1593 m->timeout = 50;
1594 }
1595
1596 /* do LOS after calls to update_position */
1597 if (pl->contr->do_los)
1598 {
1599 update_los (pl);
1600 pl->contr->do_los = 0;
1601 }
1602
1603 /* Big maps need a different drawing mechanism to work */
1604 draw_client_map1 (pl);
1605}
1606
1607
1608/*****************************************************************************/ 1402/*****************************************************************************/
1609
1610/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 1403/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1611
1612/* a player. Of course, the client need to know the command to be able to */ 1404/* a player. Of course, the client need to know the command to be able to */
1613
1614/* manage it ! */ 1405/* manage it ! */
1615
1616/*****************************************************************************/ 1406/*****************************************************************************/
1617void 1407void
1618send_plugin_custom_message (object *pl, char *buf) 1408send_plugin_custom_message (object *pl, char *buf)
1619{ 1409{
1620 pl->contr->ns->send_packet (buf); 1410 pl->contr->ns->send_packet (buf);
… …
1631 sl << "replyinfo skill_info\n"; 1421 sl << "replyinfo skill_info\n";
1632 1422
1633 for (int i = 1; i < NUM_SKILLS; i++) 1423 for (int i = 1; i < NUM_SKILLS; i++)
1634 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1424 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1635 1425
1636 if (sl.length () >= MAXSOCKBUF) 1426 if (sl.length () > MAXSOCKBUF)
1637 { 1427 {
1638 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1428 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1639 fatal (0); 1429 fatal (0);
1640 } 1430 }
1641 1431
… …
1654 sl << "replyinfo spell_paths\n"; 1444 sl << "replyinfo spell_paths\n";
1655 1445
1656 for (int i = 0; i < NRSPELLPATHS; i++) 1446 for (int i = 0; i < NRSPELLPATHS; i++)
1657 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1447 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1658 1448
1659 if (sl.length () >= MAXSOCKBUF) 1449 if (sl.length () > MAXSOCKBUF)
1660 { 1450 {
1661 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1451 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1662 fatal (0); 1452 fatal (0);
1663 } 1453 }
1664 1454
… …
1772 if (!spell->face) 1562 if (!spell->face)
1773 { 1563 {
1774 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1564 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1775 spell->face = face_find ("burnout.x11", blank_face); 1565 spell->face = face_find ("burnout.x11", blank_face);
1776 } 1566 }
1567
1568 pl->ns->send_face (spell->face);
1777 1569
1778 /* send the current values */ 1570 /* send the current values */
1779 sl << uint32 (spell->count) 1571 sl << uint32 (spell->count)
1780 << uint16 (spell->level) 1572 << uint16 (spell->level)
1781 << uint16 (spell->casting_time) 1573 << uint16 (spell->casting_time)
… …
1817 * bytes and 3 strings (because that is the spec) so we need to 1609 * bytes and 3 strings (because that is the spec) so we need to
1818 * check that the length of those 3 strings, plus the 23 bytes, 1610 * check that the length of those 3 strings, plus the 23 bytes,
1819 * won't take us over the length limit for the socket, if it does, 1611 * won't take us over the length limit for the socket, if it does,
1820 * we need to send what we already have, and restart packet formation 1612 * we need to send what we already have, and restart packet formation
1821 */ 1613 */
1614 if (spell->type != SPELL)
1615 continue;
1616
1822 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1617 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1823 * to show add_spell is 26 bytes + 2 strings. However, the overun 1618 * to show add_spell is 26 bytes + 2 strings. However, the overun
1824 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1619 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1825 * like it will fix this 1620 * like it will fix this
1826 */ 1621 */
1827 if (spell->type != SPELL)
1828 continue;
1829
1830 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1622 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1831 { 1623 {
1624 pl->ns->flush_fx ();
1832 pl->ns->send_packet (sl); 1625 pl->ns->send_packet (sl);
1833 1626
1834 sl.reset (); 1627 sl.reset ();
1835 sl << "addspell "; 1628 sl << "addspell ";
1836 } 1629 }
… …
1844 return; 1637 return;
1845 } 1638 }
1846 else 1639 else
1847 append_spell (pl, sl, spell); 1640 append_spell (pl, sl, spell);
1848 1641
1849 if (sl.length () >= MAXSOCKBUF) 1642 if (sl.length () > MAXSOCKBUF)
1850 { 1643 {
1851 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1644 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1852 fatal (0); 1645 fatal (0);
1853 } 1646 }
1854 1647
1855 /* finally, we can send the packet */ 1648 /* finally, we can send the packet */
1649 pl->ns->flush_fx ();
1856 pl->ns->send_packet (sl); 1650 pl->ns->send_packet (sl);
1857} 1651}
1858 1652

Diff Legend

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