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.77 by root, Wed Mar 14 15:44:47 2007 UTC vs.
Revision 1.129 by root, Tue May 6 19:37:01 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,2008 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.
… …
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 // face caching is mandatory
570 if (!ns->facecache)
571 {
572 ns->send_drawinfo (
573 "\n"
574 "\n"
575 "***\n"
576 "*** WARNING:\n"
577 "*** Your client does not support face/image caching,\n"
578 "*** or it has been disabled. Face caching is mandatory\n"
579 "*** so please enable it or use a newer client.\n"
580 "***\n"
581 "*** I will proceed as if face caching were enabled.\n"
582 "\n"
583 "***\n",
584 NDI_RED
585 );
586 //ns->facecache = true;
587 }
588
589 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 382 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
590} 383}
591 384
592/** Reply to ExtendedInfos command */ 385/** Reply to ExtendedInfos command */
593void 386void
… …
704 497
705 ns->send_packet (cmdback); 498 ns->send_packet (cmdback);
706} 499}
707 500
708/** 501/**
709 * client requested an image. send it rate-limited
710 * before flushing.
711 */
712void
713AskFaceCmd (char *buf, int len, client *ns)
714{
715 ns->askface.push_back (atoi (buf));
716}
717
718/**
719 * Tells client the picture it has to use
720 * to smooth a picture number given as argument.
721 */
722void
723AskSmooth (char *buf, int len, client *ns)
724{
725 ns->send_face (atoi (buf));
726}
727
728/**
729 * 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,
730 * etc.) 503 * etc.)
731 */ 504 */
732void 505void
733PlayerCmd (char *buf, int len, player *pl) 506PlayerCmd (char *buf, int len, player *pl)
… …
754 * commands. 527 * commands.
755 */ 528 */
756 pl->count = 0; 529 pl->count = 0;
757} 530}
758 531
759
760/** 532/**
761 * 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,
762 * 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
763 * '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
764 * can throttle. 536 * can throttle.
… …
766void 538void
767NewPlayerCmd (char *buf, int len, player *pl) 539NewPlayerCmd (char *buf, int len, player *pl)
768{ 540{
769 if (len <= 6) 541 if (len <= 6)
770 { 542 {
771 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);
772 return; 544 return;
773 } 545 }
774 546
775 uint16 cmdid = net_uint16 ((uint8 *)buf); 547 uint16 cmdid = net_uint16 ((uint8 *)buf);
776 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 548 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
833 { 605 {
834 case ST_PLAYING: 606 case ST_PLAYING:
835 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 607 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
836 break; 608 break;
837 609
838 case ST_CHANGE_CLASS:
839 key_change_class (pl->ob, buf[0]);
840 break;
841
842 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 610 case ST_GET_PARTY_PASSWORD: /* Get password for party */
843 receive_party_password (pl->ob, 13); 611 receive_party_password (pl->ob, 13);
844 break; 612 break;
845 613
846 default: 614 default:
… …
885 653
886 cp = strchr (cp + 1, ' '); 654 cp = strchr (cp + 1, ' ');
887 655
888 if (cp) 656 if (cp)
889 { 657 {
890 assign (ns->version, cp + 1); 658 ns->version = cp + 1;
891 659
892 if (ns->sc_version < 1026) 660 if (ns->sc_version < 1026)
893 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 661 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
894 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 662 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
895 } 663 }
… …
918 * syntax is: move (to) (tag) (nrof) 686 * syntax is: move (to) (tag) (nrof)
919 */ 687 */
920void 688void
921MoveCmd (char *buf, int len, player *pl) 689MoveCmd (char *buf, int len, player *pl)
922{ 690{
923 int vals[3], i; 691 int to, tag, nrof;
924 692
925 /* A little funky here. We only cycle for 2 records, because 693 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
926 * we obviously are not going to find a space after the third
927 * record. Perhaps we should just replace this with a
928 * sscanf?
929 */
930 for (i = 0; i < 2; i++)
931 { 694 {
932 vals[i] = atoi (buf);
933
934 if (!(buf = strchr (buf, ' ')))
935 {
936 LOG (llevError, "Incomplete move command: %s\n", buf); 695 LOG (llevError, "Incomplete move command: %s\n", buf);
937 return; 696 return;
938 }
939
940 buf++;
941 } 697 }
942 698
943 vals[2] = atoi (buf); 699 esrv_move_object (pl->ob, to, tag, nrof);
944
945/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
946 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
947} 700}
948 701
949/****************************************************************************** 702/******************************************************************************
950 * 703 *
951 * Start of commands the server sends to the client. 704 * Start of commands the server sends to the client.
… …
955/** 708/**
956 * Asks the client to query the user. This way, the client knows 709 * Asks the client to query the user. This way, the client knows
957 * it needs to send something back (vs just printing out a message) 710 * it needs to send something back (vs just printing out a message)
958 */ 711 */
959void 712void
960send_query (client *ns, uint8 flags, char *text) 713send_query (client *ns, uint8 flags, const char *text)
961{ 714{
962 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 715 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
716}
717
718/**
719 * Get player's current range attack in obuf.
720 */
721static void
722rangetostring (player *pl, char *obuf)
723{
724 dynbuf_text buf;
725
726 if (pl->ranged_ob)
727 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
728
729 if (pl->combat_ob)
730 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
731
732#if 0
733 //TODO: remove this when slot system is working, this is only for debugging
734 if (pl->ob->chosen_skill)
735 buf << " Skill*: " << pl->ob->chosen_skill->name;
736#endif
737
738 //TODO: maybe golem should become the current_weapon, quite simply?
739 if (pl->golem)
740 buf << " Golem*: " << pl->golem->name;
741
742 buf << '\0';
743 buf.linearise (obuf);
963} 744}
964 745
965#define AddIfInt64(Old,New,Type) if (Old != New) {\ 746#define AddIfInt64(Old,New,Type) if (Old != New) {\
966 Old = New; \ 747 Old = New; \
967 sl << uint8 (Type) << uint64 (New); \ 748 sl << uint8 (Type) << uint64 (New); \
… …
975#define AddIfShort(Old,New,Type) if (Old != New) {\ 756#define AddIfShort(Old,New,Type) if (Old != New) {\
976 Old = New; \ 757 Old = New; \
977 sl << uint8 (Type) << uint16 (New); \ 758 sl << uint8 (Type) << uint16 (New); \
978 } 759 }
979 760
980#define AddIfFloat(Old,New,Type) if (Old != New) {\ 761#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
981 Old = New; \ 762 Old = New; \
982 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 763 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
983 } 764 }
984 765
985#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 766#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
986 free(Old); Old = strdup (New);\ 767 free(Old); Old = strdup (New);\
987 sl << uint8 (Type) << data8 (New); \ 768 sl << uint8 (Type) << data8 (New); \
… …
1001 782
1002 client *ns = pl->ns; 783 client *ns = pl->ns;
1003 if (!ns) 784 if (!ns)
1004 return; 785 return;
1005 786
1006 object *ob = pl->ob; 787 object *ob = pl->observe;
1007 if (!ob) 788 if (!ob)
1008 return; 789 return;
790
791 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
1009 792
1010 packet sl ("stats"); 793 packet sl ("stats");
1011 794
1012 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 795 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1013 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 796 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
1022 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 805 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1023 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 806 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1024 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 807 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1025 808
1026 for (int s = 0; s < NUM_SKILLS; s++) 809 for (int s = 0; s < NUM_SKILLS; s++)
1027 if (object *skill = pl->last_skill_ob[s]) 810 if (object *skill = opl->last_skill_ob[s])
1028 if (skill->stats.exp != ns->last_skill_exp [s]) 811 if (skill->stats.exp != ns->last_skill_exp [s])
1029 { 812 {
1030 ns->last_skill_exp [s] = skill->stats.exp; 813 ns->last_skill_exp [s] = skill->stats.exp;
1031 814
1032 /* Always send along the level if exp changes. This is only 815 /* Always send along the level if exp changes. This is only
… …
1040 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 823 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1041 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 824 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1042 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 825 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1043 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 826 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1044 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 827 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1045 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 828 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1046 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 829 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1047 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 830 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
1048 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 831 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1049 832
1050 flags = 0; 833 flags = 0;
1051 834
1052 if (pl->fire_on) 835 if (opl->fire_on)
1053 flags |= SF_FIREON; 836 flags |= SF_FIREON;
1054 837
1055 if (pl->run_on) 838 if (opl->run_on)
1056 flags |= SF_RUNON; 839 flags |= SF_RUNON;
1057 840
1058 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 841 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1059 842
1060 if (ns->sc_version < 1025) 843 if (ns->sc_version < 1025)
… …
1074 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 857 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1075 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 858 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1076 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 859 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1077 } 860 }
1078 861
1079 rangetostring (ob, buf); /* we want use the new fire & run system in new client */ 862 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
1080 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 863 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1081 set_title (ob, buf); 864 set_title (ob, buf);
1082 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 865 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1083 866
1084 /* Only send it away if we have some actual data */ 867 /* Only send it away if we have some actual data */
… …
1088 871
1089/** 872/**
1090 * Tells the client that here is a player it should start using. 873 * Tells the client that here is a player it should start using.
1091 */ 874 */
1092void 875void
1093esrv_new_player (player *pl, uint32 weight) 876esrv_new_player (player *pl)
1094{ 877{
878 sint32 weight = pl->ob->client_weight ();
879
1095 packet sl ("player"); 880 packet sl ("player");
1096 881
1097 sl << uint32 (pl->ob->count) 882 sl << uint32 (pl->ob->count)
1098 << uint32 (weight) 883 << uint32 (weight)
1099 << uint32 (pl->ob->face) 884 << uint32 (pl->ob->face)
… …
1166 951
1167 if (!ns.faces_sent[face_num]) 952 if (!ns.faces_sent[face_num])
1168 if (ob) 953 if (ob)
1169 ns.send_faces (ob); 954 ns.send_faces (ob);
1170 else 955 else
1171 ns.send_face (face_num); 956 ns.send_face (face_num, 10);
1172 957
1173 sl << uint16 (face_num); 958 sl << uint16 (face_num);
1174 return 1; 959 return 1;
1175 } 960 }
1176 961
… …
1218{ 1003{
1219 prefetch_surrounding_maps (op->map, 3); 1004 prefetch_surrounding_maps (op->map, 3);
1220} 1005}
1221 1006
1222/** 1007/**
1223 * This function uses the new map1 protocol command to send the map 1008 * Draws client map.
1224 * to the client. It is necessary because the old map command supports
1225 * a maximum map size of 15x15.
1226 * This function is much simpler than the old one. This is because
1227 * the old function optimized to send as few face identifiers as possible,
1228 * at the expense of sending more coordinate location (coordinates were
1229 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1230 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1231 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1232 * and use the other 4 bits for other informatiion. For full documentation
1233 * of what we send, see the doc/Protocol file.
1234 * I will describe internally what we do:
1235 * the ns->lastmap shows how the map last looked when sent to the client.
1236 * in the lastmap structure, there is a cells array, which is set to the
1237 * maximum viewable size (As set in config.h).
1238 * in the cells, there are faces and a count value.
1239 * we use the count value to hold the darkness value. If -1, then this space
1240 * is not viewable.
1241 * we use faces[0] faces[1] faces[2] to hold what the three layers
1242 * look like.
1243 */ 1009 */
1244void 1010void
1245draw_client_map1 (object *pl) 1011draw_client_map (player *pl)
1246{ 1012{
1013 object *ob = pl->observe;
1014 if (!ob->active)
1015 return;
1016
1017 maptile *plmap = ob->map;
1018
1019 /* If player is just joining the game, he isn't here yet, so the map
1020 * can get swapped out. If so, don't try to send them a map. All will
1021 * be OK once they really log in.
1022 */
1023 if (!plmap || plmap->in_memory != MAP_ACTIVE)
1024 return;
1025
1247 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1026 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1248 sint16 nx, ny;
1249 int estartlen, eoldlen; 1027 int estartlen, eoldlen;
1250 uint8 eentrysize; 1028 uint8 eentrysize;
1251 uint16 ewhatstart, ewhatflag; 1029 uint16 ewhatstart, ewhatflag;
1252 uint8 extendedinfos; 1030 uint8 extendedinfos;
1253 maptile *m;
1254 1031
1255 client &socket = *pl->contr->ns;
1256
1257 if (!pl->active)
1258 return;
1259
1260 check_map_change (pl->contr); 1032 check_map_change (pl);
1261 prefetch_surrounding_maps (pl); 1033 prefetch_surrounding_maps (pl->ob);
1034
1035 /* do LOS after calls to update_position */
1036 if (ob != pl->ob)
1037 clear_los (pl);
1038 else if (pl->do_los)
1039 {
1040 update_los (ob);
1041 pl->do_los = 0;
1042 }
1043
1044 /**
1045 * This function uses the new map1 protocol command to send the map
1046 * to the client. It is necessary because the old map command supports
1047 * a maximum map size of 15x15.
1048 * This function is much simpler than the old one. This is because
1049 * the old function optimized to send as few face identifiers as possible,
1050 * at the expense of sending more coordinate location (coordinates were
1051 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1052 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1053 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1054 * and use the other 4 bits for other informatiion. For full documentation
1055 * of what we send, see the doc/Protocol file.
1056 * I will describe internally what we do:
1057 * the ns->lastmap shows how the map last looked when sent to the client.
1058 * in the lastmap structure, there is a cells array, which is set to the
1059 * maximum viewable size (As set in config.h).
1060 * in the cells, there are faces and a count value.
1061 * we use the count value to hold the darkness value. If -1, then this space
1062 * is not viewable.
1063 * we use faces[0] faces[1] faces[2] to hold what the three layers
1064 * look like.
1065 */
1066
1067 client &socket = *pl->ns;
1262 1068
1263 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1069 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1264 packet esl; 1070 packet esl;
1265 1071
1266 startlen = sl.length (); 1072 startlen = sl.length ();
… …
1290 ay = 0; 1096 ay = 0;
1291 1097
1292 /* We could do this logic as conditionals in the if statement, 1098 /* We could do this logic as conditionals in the if statement,
1293 * but that started to get a bit messy to look at. 1099 * but that started to get a bit messy to look at.
1294 */ 1100 */
1295 max_x = pl->x + (socket.mapx + 1) / 2; 1101 max_x = ob->x + (socket.mapx + 1) / 2;
1296 max_y = pl->y + (socket.mapy + 1) / 2; 1102 max_y = ob->y + (socket.mapy + 1) / 2;
1297 1103
1298 maptile *plmap = pl->map;
1299
1300 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1104 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1301 { 1105 {
1106 sint16 nx, ny;
1107 maptile *m = 0;
1108
1302 ax = 0; 1109 ax = 0;
1303 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1110 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1304 { 1111 {
1112 // check to see if we can simply go one right quickly
1113 ++nx;
1114 if (m && nx >= m->width)
1115 m = 0;
1116
1117 if (!m)
1118 {
1119 nx = x; ny = y; m = plmap;
1120
1121 if (xy_normalise (m, nx, ny))
1122 m->touch ();
1123 else
1124 m = 0;
1125 }
1126
1305 int emask, mask; 1127 int emask, mask;
1306 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1128 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1307 1129
1308 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1130 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1309 1131
1310 /* If the coordinates are not valid, or it is too dark to see, 1132 /* If the coordinates are not valid, or it is too dark to see,
1311 * we tell the client as such 1133 * we tell the client as such
1312 */ 1134 */
1313 nx = x;
1314 ny = y;
1315 m = get_map_from_coord (plmap, &nx, &ny);
1316
1317 if (!m) 1135 if (!m)
1318 { 1136 {
1319 /* space is out of map. Update space and clear values 1137 /* space is out of map. Update space and clear values
1320 * if this hasn't already been done. If the space is out 1138 * if this hasn't already been done. If the space is out
1321 * of the map, it shouldn't have a head 1139 * of the map, it shouldn't have a head
… …
1327 } 1145 }
1328 1146
1329 continue; 1147 continue;
1330 } 1148 }
1331 1149
1332 m->touch ();
1333
1334 int d = pl->contr->blocked_los[ax][ay]; 1150 int d = pl->blocked_los[ax][ay];
1335 1151
1336 if (d > 3) 1152 if (d > 3)
1337 { 1153 {
1338 1154
1339 int need_send = 0, count; 1155 int need_send = 0, count;
… …
1402 } 1218 }
1403 1219
1404 lastcell.count = d; 1220 lastcell.count = d;
1405 1221
1406 mapspace &ms = m->at (nx, ny); 1222 mapspace &ms = m->at (nx, ny);
1223 ms.update ();
1407 1224
1408 if (socket.extmap) 1225 if (socket.extmap)
1409 { 1226 {
1410 uint8 stat_hp = 0; 1227 uint8 stat_hp = 0;
1411 uint8 stat_width = 0; 1228 uint8 stat_width = 0;
1412 uint8 flags = 0; 1229 uint8 flags = 0;
1413 UUID player = 0; 1230 tag_t player = 0;
1414 1231
1415 // send hp information, if applicable 1232 // send hp information, if applicable
1416 if (object *op = ms.faces_obj [0]) 1233 if (object *op = ms.faces_obj [0])
1234 if (op->is_head () && !op->invisible)
1417 { 1235 {
1418 if (op->head || op->invisible) 1236 if (op->stats.maxhp > op->stats.hp
1419 ; // do not show 1237 && op->stats.maxhp > 0
1420 else if (op->type == PLAYER 1238 && (op->type == PLAYER
1239 || op->type == DOOR // does not work, have maxhp 0
1421 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1240 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)))
1422 {
1423 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1424 { 1241 {
1425 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1242 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1426 stat_width = op->arch->tail_x; 1243 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1427 } 1244 }
1428 }
1429 1245
1430 if (op->msg && op->msg[0] == '@') 1246 if (op->msg && op->msg[0] == '@')
1431 flags |= 1; 1247 flags |= 1;
1432 1248
1433 if (op->type == PLAYER && op != pl) 1249 if (op->type == PLAYER && op != ob)
1434 player = op->count; 1250 player = op->count;
1435 } 1251 }
1436 1252
1437 if (lastcell.stat_hp != stat_hp) 1253 if (lastcell.stat_hp != stat_hp)
1438 { 1254 {
1439 lastcell.stat_hp = stat_hp; 1255 lastcell.stat_hp = stat_hp;
1440 1256
… …
1459 1275
1460 mask |= 0x8; 1276 mask |= 0x8;
1461 *last_ext |= 0x80; 1277 *last_ext |= 0x80;
1462 last_ext = &sl[sl.length ()]; 1278 last_ext = &sl[sl.length ()];
1463 1279
1464 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1280 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1465 } 1281 }
1466 1282
1467 if (lastcell.flags != flags) 1283 if (lastcell.flags != flags)
1468 { 1284 {
1469 lastcell.flags = flags; 1285 lastcell.flags = flags;
… …
1482 1298
1483 /* Middle face */ 1299 /* Middle face */
1484 if (update_space (sl, socket, ms, lastcell, 1)) 1300 if (update_space (sl, socket, ms, lastcell, 1))
1485 mask |= 0x2; 1301 mask |= 0x2;
1486 1302
1487 if (ms.player () == pl 1303 if (ms.player () == ob
1488 && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) 1304 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1489 { 1305 {
1490 // force player to be visible to himself if invisible 1306 // force player to be visible to himself if invisible
1491 if (lastcell.faces[0] != pl->face) 1307 if (lastcell.faces[0] != ob->face)
1492 { 1308 {
1493 lastcell.faces[0] = pl->face; 1309 lastcell.faces[0] = ob->face;
1494 1310
1495 mask |= 0x1; 1311 mask |= 0x1;
1496 sl << uint16 (pl->face); 1312 sl << uint16 (ob->face);
1497 1313
1498 socket.send_faces (pl); 1314 socket.send_faces (ob);
1499 } 1315 }
1500 } 1316 }
1501 /* Top face */ 1317 /* Top face */
1502 else if (update_space (sl, socket, ms, lastcell, 0)) 1318 else if (update_space (sl, socket, ms, lastcell, 0))
1503 mask |= 0x1; 1319 mask |= 0x1;
1504
1505 1320
1506 /* Check to see if we are in fact sending anything for this 1321 /* Check to see if we are in fact sending anything for this
1507 * space by checking the mask. If so, update the mask. 1322 * space by checking the mask. If so, update the mask.
1508 * if not, reset the len to that from before adding the mask 1323 * if not, reset the len to that from before adding the mask
1509 * value, so we don't send those bits. 1324 * value, so we don't send those bits.
… …
1543 } 1358 }
1544 } /* else this is a viewable space */ 1359 } /* else this is a viewable space */
1545 } /* for x loop */ 1360 } /* for x loop */
1546 } /* for y loop */ 1361 } /* for y loop */
1547 1362
1363 socket.flush_fx ();
1364
1548 /* Verify that we in fact do need to send this */ 1365 /* Verify that we in fact do need to send this */
1549 if (socket.ext_mapinfos) 1366 if (socket.ext_mapinfos)
1550 { 1367 {
1551 if (!(sl.length () > startlen || socket.sent_scroll)) 1368 if (!(sl.length () > startlen || socket.sent_scroll))
1552 { 1369 {
… …
1566 socket.send_packet (sl); 1383 socket.send_packet (sl);
1567 socket.sent_scroll = 0; 1384 socket.sent_scroll = 0;
1568 } 1385 }
1569} 1386}
1570 1387
1571/**
1572 * Draws client map.
1573 */
1574void
1575draw_client_map (object *pl)
1576{
1577 int i, j;
1578 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1579 int mflags;
1580 struct Map newmap;
1581 maptile *m, *pm;
1582
1583 if (pl->type != PLAYER)
1584 {
1585 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1586 return;
1587 }
1588
1589 pm = pl->map;
1590
1591 /* If player is just joining the game, he isn't here yet, so the map
1592 * can get swapped out. If so, don't try to send them a map. All will
1593 * be OK once they really log in.
1594 */
1595 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1596 return;
1597
1598 memset (&newmap, 0, sizeof (struct Map));
1599
1600 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1601 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1602 {
1603 ax = i;
1604 ay = j;
1605 m = pm;
1606 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1607
1608 if (mflags & P_OUT_OF_MAP)
1609 continue;
1610
1611 /* If a map is visible to the player, we don't want to swap it out
1612 * just to reload it. This should really call something like
1613 * swap_map, but this is much more efficient and 'good enough'
1614 */
1615 if (mflags & P_NEW_MAP)
1616 m->timeout = 50;
1617 }
1618
1619 /* do LOS after calls to update_position */
1620 if (pl->contr->do_los)
1621 {
1622 update_los (pl);
1623 pl->contr->do_los = 0;
1624 }
1625
1626 /* Big maps need a different drawing mechanism to work */
1627 draw_client_map1 (pl);
1628}
1629
1630
1631/*****************************************************************************/ 1388/*****************************************************************************/
1632
1633/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 1389/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1634
1635/* a player. Of course, the client need to know the command to be able to */ 1390/* a player. Of course, the client need to know the command to be able to */
1636
1637/* manage it ! */ 1391/* manage it ! */
1638
1639/*****************************************************************************/ 1392/*****************************************************************************/
1640void 1393void
1641send_plugin_custom_message (object *pl, char *buf) 1394send_plugin_custom_message (object *pl, char *buf)
1642{ 1395{
1643 pl->contr->ns->send_packet (buf); 1396 pl->contr->ns->send_packet (buf);
… …
1654 sl << "replyinfo skill_info\n"; 1407 sl << "replyinfo skill_info\n";
1655 1408
1656 for (int i = 1; i < NUM_SKILLS; i++) 1409 for (int i = 1; i < NUM_SKILLS; i++)
1657 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1410 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1658 1411
1659 if (sl.length () >= MAXSOCKBUF) 1412 if (sl.length () > MAXSOCKBUF)
1660 { 1413 {
1661 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1414 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1662 fatal (0); 1415 fatal (0);
1663 } 1416 }
1664 1417
… …
1677 sl << "replyinfo spell_paths\n"; 1430 sl << "replyinfo spell_paths\n";
1678 1431
1679 for (int i = 0; i < NRSPELLPATHS; i++) 1432 for (int i = 0; i < NRSPELLPATHS; i++)
1680 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1433 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1681 1434
1682 if (sl.length () >= MAXSOCKBUF) 1435 if (sl.length () > MAXSOCKBUF)
1683 { 1436 {
1684 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1437 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1685 fatal (0); 1438 fatal (0);
1686 } 1439 }
1687 1440
… …
1795 if (!spell->face) 1548 if (!spell->face)
1796 { 1549 {
1797 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1550 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1798 spell->face = face_find ("burnout.x11", blank_face); 1551 spell->face = face_find ("burnout.x11", blank_face);
1799 } 1552 }
1553
1554 pl->ns->send_face (spell->face);
1800 1555
1801 /* send the current values */ 1556 /* send the current values */
1802 sl << uint32 (spell->count) 1557 sl << uint32 (spell->count)
1803 << uint16 (spell->level) 1558 << uint16 (spell->level)
1804 << uint16 (spell->casting_time) 1559 << uint16 (spell->casting_time)
… …
1840 * bytes and 3 strings (because that is the spec) so we need to 1595 * bytes and 3 strings (because that is the spec) so we need to
1841 * check that the length of those 3 strings, plus the 23 bytes, 1596 * check that the length of those 3 strings, plus the 23 bytes,
1842 * won't take us over the length limit for the socket, if it does, 1597 * won't take us over the length limit for the socket, if it does,
1843 * we need to send what we already have, and restart packet formation 1598 * we need to send what we already have, and restart packet formation
1844 */ 1599 */
1600 if (spell->type != SPELL)
1601 continue;
1602
1845 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1603 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1846 * to show add_spell is 26 bytes + 2 strings. However, the overun 1604 * to show add_spell is 26 bytes + 2 strings. However, the overun
1847 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1605 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1848 * like it will fix this 1606 * like it will fix this
1849 */ 1607 */
1850 if (spell->type != SPELL)
1851 continue;
1852
1853 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1608 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1854 { 1609 {
1610 pl->ns->flush_fx ();
1855 pl->ns->send_packet (sl); 1611 pl->ns->send_packet (sl);
1856 1612
1857 sl.reset (); 1613 sl.reset ();
1858 sl << "addspell "; 1614 sl << "addspell ";
1859 } 1615 }
… …
1867 return; 1623 return;
1868 } 1624 }
1869 else 1625 else
1870 append_spell (pl, sl, spell); 1626 append_spell (pl, sl, spell);
1871 1627
1872 if (sl.length () >= MAXSOCKBUF) 1628 if (sl.length () > MAXSOCKBUF)
1873 { 1629 {
1874 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1630 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1875 fatal (0); 1631 fatal (0);
1876 } 1632 }
1877 1633
1878 /* finally, we can send the packet */ 1634 /* finally, we can send the packet */
1635 pl->ns->flush_fx ();
1879 pl->ns->send_packet (sl); 1636 pl->ns->send_packet (sl);
1880} 1637}
1881 1638

Diff Legend

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