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.79 by root, Thu Mar 15 16:25:45 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));
136 137
137 pl->ns->force_newmap = false; 138 pl->ns->force_newmap = false;
138 139
139 if (pl->ns->newmapcmd == 1) 140 if (pl->ns->newmapcmd == 1)
… …
145/** check for map/region change and send new map data */ 146/** check for map/region change and send new map data */
146static void 147static void
147check_map_change (player *pl) 148check_map_change (player *pl)
148{ 149{
149 client &socket = *pl->ns; 150 client &socket = *pl->ns;
150 object *ob = pl->ob; 151 object *ob = pl->observe;
151 char buf[MAX_BUF]; /* eauugggh */
152 152
153 if (socket.force_newmap && 0) 153 if (socket.current_map != ob->map || socket.force_newmap)
154 { 154 {
155 // force newmap is used for clients that do not redraw their map 155 clear_map (pl);
156 // after image uploads.
157 socket.current_map = ob->map; 156 socket.current_map = ob->map;
158 clear_map (pl);
159 }
160 else if (socket.current_map != ob->map)
161 {
162 clear_map (pl);
163 157
164 if (socket.mapinfocmd) 158 if (socket.mapinfocmd)
165 { 159 {
166 if (ob->map && ob->map->path[0]) 160 if (ob->map && ob->map->path[0])
167 { 161 {
168 int flags = 0; 162 int flags = 0;
169 163
170 if (ob->map->tile_path[0]) 164 if (ob->map->tile_path[0]) flags |= 1;
171 flags |= 1;
172 if (ob->map->tile_path[1]) 165 if (ob->map->tile_path[1]) flags |= 2;
173 flags |= 2;
174 if (ob->map->tile_path[2]) 166 if (ob->map->tile_path[2]) flags |= 4;
175 flags |= 4;
176 if (ob->map->tile_path[3]) 167 if (ob->map->tile_path[3]) flags |= 8;
177 flags |= 8;
178 168
179 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",
180 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);
181 } 172 }
182 else 173 else
183 snprintf (buf, MAX_BUF, "mapinfo current");
184
185 socket.send_packet (buf); 174 socket.send_packet ("mapinfo current");
186 } 175 }
187 } 176 }
188 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)
189 { 178 {
190 int dx = ob->x - socket.current_x; 179 int dx = ob->x - socket.current_x;
… …
203 socket.current_y = ob->y; 192 socket.current_y = ob->y;
204 193
205 region *reg = ob->region (); 194 region *reg = ob->region ();
206 if (socket.current_region != reg) 195 if (socket.current_region != reg)
207 { 196 {
197 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
208 socket.current_region = reg; 198 socket.current_region = reg;
209 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
210 } 199 }
211} 200}
212 201
213/** 202/**
214 * RequestInfo is sort of a meta command. There is some specific 203 * RequestInfo is sort of a meta command. There is some specific
215 * request of information, but we call other functions to provide 204 * request of information, but we call other functions to provide
216 * that information. 205 * that information.
217 */ 206 */
218void 207void
219RequestInfo (char *buf, int len, client * ns) 208RequestInfo (char *buf, int len, client *ns)
220{ 209{
221 char *params = NULL, *cp; 210 char *params;
222
223 /* No match */
224 char bigbuf[MAX_BUF];
225 int slen;
226
227 /* Set up replyinfo before we modify any of the buffers - this is used
228 * if we don't find a match.
229 */
230 strcpy (bigbuf, "replyinfo ");
231 slen = strlen (bigbuf);
232 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
233 211
234 /* find the first space, make it null, and update the 212 /* find the first space, make it null, and update the
235 * params pointer. 213 * params pointer.
236 */ 214 */
237 for (cp = buf; *cp != '\0'; cp++) 215 for (params = buf; *params; params++)
238 if (*cp == ' ') 216 if (*params == ' ')
239 { 217 {
240 *cp = '\0';
241 params = cp + 1; 218 *params++ = 0;
242 break; 219 break;
243 } 220 }
244 221
245 if (!strcmp (buf, "image_info")) 222 if (!strcmp (buf, "image_info"))
246 send_image_info (ns, params); 223 send_image_info (ns, params);
… …
249 else if (!strcmp (buf, "skill_info")) 226 else if (!strcmp (buf, "skill_info"))
250 send_skill_info (ns, params); 227 send_skill_info (ns, params);
251 else if (!strcmp (buf, "spell_paths")) 228 else if (!strcmp (buf, "spell_paths"))
252 send_spell_paths (ns, params); 229 send_spell_paths (ns, params);
253 else 230 else
254 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 }
255} 238}
256 239
257void 240void
258ExtCmd (char *buf, int len, player *pl) 241ExtCmd (char *buf, int len, player *pl)
259{ 242{
… …
262 245
263void 246void
264ExtiCmd (char *buf, int len, client *ns) 247ExtiCmd (char *buf, int len, client *ns)
265{ 248{
266 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;
267} 336}
268 337
269void 338void
270MapInfoCmd (char *buf, int len, player *pl) 339MapInfoCmd (char *buf, int len, player *pl)
271{ 340{
272 // <mapinfo tag spatial tile-path 341 // <mapinfo tag spatial tile-path
273 // >mapinfo tag spatial flags x y w h hash 342 // >mapinfo tag spatial flags x y w h hash
274 343
275 char bigbuf[MAX_BUF], *token;
276
277 token = buf; 344 char *token = buf;
278 // copy token 345
279 if (!(buf = strchr (buf, ' '))) 346 if (!(buf = strchr (buf, ' ')))
280 return; 347 return;
281 348
282 *buf++ = 0;
283
284 if (!strncmp (buf, "spatial ", 8)) 349 if (!strncmp (buf, " spatial ", 9))
285 { 350 {
286 buf += 8; 351 char *copy = strdup (token);
352 copy [buf - token] = 0;
287 353
288 // initial map and its origin 354#if 0
289 maptile *map = pl->ob->map; 355 // this makes only sense when we flush the buffer immediately
290 sint16 dx, dy; 356 if (pl->ns->mapinfo_try (copy))
291 int mapx = pl->ns->mapx / 2 - pl->ob->x; 357 free (copy);
292 int mapy = pl->ns->mapy / 2 - pl->ob->y;
293 int max_distance = 8; // limit maximum path length to something generous
294
295 while (*buf && map && max_distance)
296 {
297 int dir = *buf++;
298
299 switch (dir)
300 {
301 case '1':
302 dx = 0;
303 dy = -1;
304 map = map->xy_find (dx, dy);
305 map && (mapy -= map->height);
306 break;
307 case '2':
308 mapx += map->width;
309 dx = map->width;
310 dy = 0;
311 map = map->xy_find (dx, dy);
312 break;
313 case '3':
314 mapy += map->height;
315 dx = 0;
316 dy = map->height;
317 map = map->xy_find (dx, dy);
318 break;
319 case '4':
320 dx = -1;
321 dy = 0;
322 map = map->xy_find (dx, dy);
323 map && (mapx -= map->width);
324 break;
325 }
326
327 --max_distance;
328 }
329
330 if (!max_distance)
331 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
332 else if (map && map->path[0])
333 {
334 int flags = 0;
335
336 if (map->tile_path[0])
337 flags |= 1;
338 if (map->tile_path[1])
339 flags |= 2;
340 if (map->tile_path[2])
341 flags |= 4;
342 if (map->tile_path[3])
343 flags |= 8;
344
345 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
346 }
347 else 358 else
348 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 359#endif
360 pl->ns->mapinfo_queue.push_back (copy);
349 } 361 }
350 else 362 else
351 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 363 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
352
353 pl->ns->send_packet (bigbuf);
354} 364}
355 365
356/** This is the Setup cmd - easy first implementation */ 366/** This is the Setup cmd */
357void 367void
358SetUp (char *buf, int len, client * ns) 368SetUp (char *buf, int len, client * ns)
359{ 369{
360 int s, slen; 370 INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
361 char *cmd, *param, cmdback[HUGE_BUF];
362
363 /* run through the cmds of setup
364 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
365 *
366 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
367 * The client then must sort this out
368 */
369
370 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
371
372 strcpy (cmdback, "setup");
373 for (s = 0; s < len; )
374 {
375 cmd = &buf[s];
376
377 /* find the next space, and put a null there */
378 for (; buf[s] && buf[s] != ' '; s++)
379 ;
380
381 buf[s++] = 0;
382
383 while (buf[s] == ' ')
384 s++;
385
386 if (s >= len)
387 break;
388
389 param = &buf[s];
390
391 for (; buf[s] && buf[s] != ' '; s++)
392 ;
393
394 buf[s++] = 0;
395
396 while (buf[s] == ' ')
397 s++;
398
399 slen = strlen (cmdback);
400 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
401 safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
402 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
403
404 if (!strcmp (cmd, "sound"))
405 {
406 ns->sound = atoi (param);
407 safe_strcat (cmdback, param, &slen, HUGE_BUF);
408 }
409 else if (!strcmp (cmd, "exp64"))
410 safe_strcat (cmdback, param, &slen, HUGE_BUF);
411 else if (!strcmp (cmd, "spellmon"))
412 {
413 ns->monitor_spells = atoi (param);
414 safe_strcat (cmdback, param, &slen, HUGE_BUF);
415 }
416 else if (!strcmp (cmd, "darkness"))
417 {
418 ns->darkness = atoi (param);
419 safe_strcat (cmdback, param, &slen, HUGE_BUF);
420 }
421 else if (!strcmp (cmd, "map1cmd"))
422 {
423 if (atoi (param))
424 ns->mapmode = Map1Cmd;
425 /* if beyond this size, need to use map1cmd no matter what */
426 if (ns->mapx > 11 || ns->mapy > 11)
427 ns->mapmode = Map1Cmd;
428 safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
429 }
430 else if (!strcmp (cmd, "map1acmd"))
431 {
432 if (atoi (param))
433 ns->mapmode = Map1aCmd;
434 /* if beyond this size, need to use map1acmd no matter what */
435 if (ns->mapx > 11 || ns->mapy > 11)
436 ns->mapmode = Map1aCmd;
437 safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
438 }
439 else if (!strcmp (cmd, "newmapcmd"))
440 {
441 ns->newmapcmd = atoi (param);
442 safe_strcat (cmdback, param, &slen, HUGE_BUF);
443 }
444 else if (!strcmp (cmd, "mapinfocmd"))
445 {
446 ns->mapinfocmd = atoi (param);
447 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
448 }
449 else if (!strcmp (cmd, "extcmd"))
450 {
451 ns->extcmd = atoi (param);
452 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
453 }
454 else if (!strcmp (cmd, "extmap"))
455 {
456 ns->extmap = atoi (param);
457 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
458 }
459 else if (!strcmp (cmd, "facecache"))
460 {
461 ns->facecache = atoi (param);
462 safe_strcat (cmdback, param, &slen, HUGE_BUF);
463 }
464 else if (!strcmp (cmd, "faceset"))
465 {
466 char tmpbuf[20];
467 int q = atoi (param);
468
469 if (is_valid_faceset (q))
470 ns->faceset = q;
471
472 sprintf (tmpbuf, "%d", ns->faceset);
473 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
474 /* if the client is using faceset, it knows about image2 command */
475 ns->image2 = 1;
476 }
477 else if (!strcmp (cmd, "itemcmd"))
478 {
479 /* Version of the item protocol command to use. Currently,
480 * only supported versions are 1 and 2. Using a numeric
481 * value will make it very easy to extend this in the future.
482 */
483 char tmpbuf[20];
484 int q = atoi (param);
485
486 if (q < 1 || q > 2)
487 {
488 strcpy (tmpbuf, "FALSE");
489 }
490 else
491 {
492 ns->itemcmd = q;
493 sprintf (tmpbuf, "%d", ns->itemcmd);
494 }
495 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
496 }
497 else if (!strcmp (cmd, "mapsize"))
498 {
499 int x, y = 0;
500 char tmpbuf[MAX_BUF], *cp;
501
502 x = atoi (param);
503 for (cp = param; *cp != 0; cp++)
504 if (*cp == 'x' || *cp == 'X')
505 {
506 y = atoi (cp + 1);
507 break;
508 }
509
510 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
511 {
512 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
513 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
514 }
515 else
516 {
517 ns->mapx = x;
518 ns->mapy = y;
519 /* better to send back what we are really using and not the
520 * param as given to us in case it gets parsed differently.
521 */
522 sprintf (tmpbuf, "%dx%d", x, y);
523 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
524 /* If beyond this size and still using orig map command, need to
525 * go to map1cmd.
526 */
527 if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
528 ns->mapmode = Map1Cmd;
529 }
530 }
531 else if (!strcmp (cmd, "extendedMapInfos"))
532 {
533 /* Added by tchize
534 * prepare to use the mapextended command
535 */
536 char tmpbuf[20];
537
538 ns->ext_mapinfos = (atoi (param));
539 sprintf (tmpbuf, "%d", ns->ext_mapinfos);
540 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
541 }
542 else if (!strcmp (cmd, "extendedTextInfos"))
543 {
544 /* Added by tchize
545 * prepare to use the extended text commands
546 * Client toggle this to non zero to get exttext
547 */
548 char tmpbuf[20];
549
550 ns->has_readable_type = (atoi (param));
551 sprintf (tmpbuf, "%d", ns->has_readable_type);
552 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
553 }
554 else
555 {
556 /* Didn't get a setup command we understood -
557 * report a failure to the client.
558 */
559 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
560 }
561 } /* for processing all the setup commands */
562
563 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
564 ns->send_packet (cmdback);
565} 371}
566 372
567/** 373/**
568 * The client has requested to be added to the game. 374 * The client has requested to be added to the game.
569 * 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.
… …
571 * 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.
572 */ 378 */
573void 379void
574AddMeCmd (char *buf, int len, client *ns) 380AddMeCmd (char *buf, int len, client *ns)
575{ 381{
576 // face caching is mandatory
577 if (!ns->facecache)
578 {
579 ns->send_drawinfo (
580 "\n"
581 "\n"
582 "***\n"
583 "*** WARNING:\n"
584 "*** Your client does not support face/image caching,\n"
585 "*** or it has been disabled. Face caching is mandatory\n"
586 "*** so please enable it or use a newer client.\n"
587 "***\n"
588 "*** Look at your client preferences:\n"
589 "***\n"
590 "*** CFPlus: all known versions automatically enable the facecache.\n"
591 "*** cfclient: use the -cache commandline option.\n"
592 "*** cfclient: map will not redraw automatically (bug).\n"
593 "*** gcfclient: use -cache commandline option, or enable\n"
594 "*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.\n"
595 "*** jcrossclient: your client is broken, use CFPlus or gcfclient.\n"
596 "***\n"
597 "***\n",
598 NDI_RED
599 );
600
601 if (strstr (ns->version, "jcrossclient"))
602 /* let them, for now*/;
603 else
604 {
605 ns->flush ();
606 //ns->destroy ();
607 }
608 //ns->facecache = true;
609 }
610
611 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 382 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
612} 383}
613 384
614/** Reply to ExtendedInfos command */ 385/** Reply to ExtendedInfos command */
615void 386void
… …
726 497
727 ns->send_packet (cmdback); 498 ns->send_packet (cmdback);
728} 499}
729 500
730/** 501/**
731 * client requested an image. send it rate-limited
732 * before flushing.
733 */
734void
735AskFaceCmd (char *buf, int len, client *ns)
736{
737 ns->askface.push_back (atoi (buf));
738}
739
740/**
741 * Tells client the picture it has to use
742 * to smooth a picture number given as argument.
743 */
744void
745AskSmooth (char *buf, int len, client *ns)
746{
747 ns->send_face (atoi (buf));
748}
749
750/**
751 * 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,
752 * etc.) 503 * etc.)
753 */ 504 */
754void 505void
755PlayerCmd (char *buf, int len, player *pl) 506PlayerCmd (char *buf, int len, player *pl)
… …
776 * commands. 527 * commands.
777 */ 528 */
778 pl->count = 0; 529 pl->count = 0;
779} 530}
780 531
781
782/** 532/**
783 * 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,
784 * 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
785 * '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
786 * can throttle. 536 * can throttle.
… …
788void 538void
789NewPlayerCmd (char *buf, int len, player *pl) 539NewPlayerCmd (char *buf, int len, player *pl)
790{ 540{
791 if (len <= 6) 541 if (len <= 6)
792 { 542 {
793 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);
794 return; 544 return;
795 } 545 }
796 546
797 uint16 cmdid = net_uint16 ((uint8 *)buf); 547 uint16 cmdid = net_uint16 ((uint8 *)buf);
798 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 548 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
855 { 605 {
856 case ST_PLAYING: 606 case ST_PLAYING:
857 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 607 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
858 break; 608 break;
859 609
860 case ST_CHANGE_CLASS:
861 key_change_class (pl->ob, buf[0]);
862 break;
863
864 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 610 case ST_GET_PARTY_PASSWORD: /* Get password for party */
865 receive_party_password (pl->ob, 13); 611 receive_party_password (pl->ob, 13);
866 break; 612 break;
867 613
868 default: 614 default:
… …
907 653
908 cp = strchr (cp + 1, ' '); 654 cp = strchr (cp + 1, ' ');
909 655
910 if (cp) 656 if (cp)
911 { 657 {
912 assign (ns->version, cp + 1); 658 ns->version = cp + 1;
913 659
914 if (ns->sc_version < 1026) 660 if (ns->sc_version < 1026)
915 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 661 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
916 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 662 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
917 } 663 }
… …
940 * syntax is: move (to) (tag) (nrof) 686 * syntax is: move (to) (tag) (nrof)
941 */ 687 */
942void 688void
943MoveCmd (char *buf, int len, player *pl) 689MoveCmd (char *buf, int len, player *pl)
944{ 690{
945 int vals[3], i; 691 int to, tag, nrof;
946 692
947 /* A little funky here. We only cycle for 2 records, because 693 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
948 * we obviously are not going to find a space after the third
949 * record. Perhaps we should just replace this with a
950 * sscanf?
951 */
952 for (i = 0; i < 2; i++)
953 { 694 {
954 vals[i] = atoi (buf);
955
956 if (!(buf = strchr (buf, ' ')))
957 {
958 LOG (llevError, "Incomplete move command: %s\n", buf); 695 LOG (llevError, "Incomplete move command: %s\n", buf);
959 return; 696 return;
960 }
961
962 buf++;
963 } 697 }
964 698
965 vals[2] = atoi (buf); 699 esrv_move_object (pl->ob, to, tag, nrof);
966
967/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
968 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
969} 700}
970 701
971/****************************************************************************** 702/******************************************************************************
972 * 703 *
973 * Start of commands the server sends to the client. 704 * Start of commands the server sends to the client.
… …
977/** 708/**
978 * 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
979 * 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)
980 */ 711 */
981void 712void
982send_query (client *ns, uint8 flags, char *text) 713send_query (client *ns, uint8 flags, const char *text)
983{ 714{
984 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);
985} 744}
986 745
987#define AddIfInt64(Old,New,Type) if (Old != New) {\ 746#define AddIfInt64(Old,New,Type) if (Old != New) {\
988 Old = New; \ 747 Old = New; \
989 sl << uint8 (Type) << uint64 (New); \ 748 sl << uint8 (Type) << uint64 (New); \
… …
997#define AddIfShort(Old,New,Type) if (Old != New) {\ 756#define AddIfShort(Old,New,Type) if (Old != New) {\
998 Old = New; \ 757 Old = New; \
999 sl << uint8 (Type) << uint16 (New); \ 758 sl << uint8 (Type) << uint16 (New); \
1000 } 759 }
1001 760
1002#define AddIfFloat(Old,New,Type) if (Old != New) {\ 761#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
1003 Old = New; \ 762 Old = New; \
1004 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 763 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
1005 } 764 }
1006 765
1007#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 766#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1008 free(Old); Old = strdup (New);\ 767 free(Old); Old = strdup (New);\
1009 sl << uint8 (Type) << data8 (New); \ 768 sl << uint8 (Type) << data8 (New); \
… …
1023 782
1024 client *ns = pl->ns; 783 client *ns = pl->ns;
1025 if (!ns) 784 if (!ns)
1026 return; 785 return;
1027 786
1028 object *ob = pl->ob; 787 object *ob = pl->observe;
1029 if (!ob) 788 if (!ob)
1030 return; 789 return;
790
791 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
1031 792
1032 packet sl ("stats"); 793 packet sl ("stats");
1033 794
1034 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 795 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1035 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 796 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
1044 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 805 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1045 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 806 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1046 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 807 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1047 808
1048 for (int s = 0; s < NUM_SKILLS; s++) 809 for (int s = 0; s < NUM_SKILLS; s++)
1049 if (object *skill = pl->last_skill_ob[s]) 810 if (object *skill = opl->last_skill_ob[s])
1050 if (skill->stats.exp != ns->last_skill_exp [s]) 811 if (skill->stats.exp != ns->last_skill_exp [s])
1051 { 812 {
1052 ns->last_skill_exp [s] = skill->stats.exp; 813 ns->last_skill_exp [s] = skill->stats.exp;
1053 814
1054 /* Always send along the level if exp changes. This is only 815 /* Always send along the level if exp changes. This is only
… …
1062 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 823 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1063 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 824 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1064 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 825 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1065 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 826 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1066 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 827 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1067 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 828 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1068 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 829 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1069 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);
1070 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);
1071 832
1072 flags = 0; 833 flags = 0;
1073 834
1074 if (pl->fire_on) 835 if (opl->fire_on)
1075 flags |= SF_FIREON; 836 flags |= SF_FIREON;
1076 837
1077 if (pl->run_on) 838 if (opl->run_on)
1078 flags |= SF_RUNON; 839 flags |= SF_RUNON;
1079 840
1080 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 841 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1081 842
1082 if (ns->sc_version < 1025) 843 if (ns->sc_version < 1025)
… …
1096 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);
1097 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);
1098 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);
1099 } 860 }
1100 861
1101 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 */
1102 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 863 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1103 set_title (ob, buf); 864 set_title (ob, buf);
1104 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 865 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1105 866
1106 /* Only send it away if we have some actual data */ 867 /* Only send it away if we have some actual data */
… …
1110 871
1111/** 872/**
1112 * 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.
1113 */ 874 */
1114void 875void
1115esrv_new_player (player *pl, uint32 weight) 876esrv_new_player (player *pl)
1116{ 877{
878 sint32 weight = pl->ob->client_weight ();
879
1117 packet sl ("player"); 880 packet sl ("player");
1118 881
1119 sl << uint32 (pl->ob->count) 882 sl << uint32 (pl->ob->count)
1120 << uint32 (weight) 883 << uint32 (weight)
1121 << uint32 (pl->ob->face) 884 << uint32 (pl->ob->face)
… …
1188 951
1189 if (!ns.faces_sent[face_num]) 952 if (!ns.faces_sent[face_num])
1190 if (ob) 953 if (ob)
1191 ns.send_faces (ob); 954 ns.send_faces (ob);
1192 else 955 else
1193 ns.send_face (face_num); 956 ns.send_face (face_num, 10);
1194 957
1195 sl << uint16 (face_num); 958 sl << uint16 (face_num);
1196 return 1; 959 return 1;
1197 } 960 }
1198 961
… …
1240{ 1003{
1241 prefetch_surrounding_maps (op->map, 3); 1004 prefetch_surrounding_maps (op->map, 3);
1242} 1005}
1243 1006
1244/** 1007/**
1245 * This function uses the new map1 protocol command to send the map 1008 * Draws client map.
1246 * to the client. It is necessary because the old map command supports
1247 * a maximum map size of 15x15.
1248 * This function is much simpler than the old one. This is because
1249 * the old function optimized to send as few face identifiers as possible,
1250 * at the expense of sending more coordinate location (coordinates were
1251 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1252 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1253 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1254 * and use the other 4 bits for other informatiion. For full documentation
1255 * of what we send, see the doc/Protocol file.
1256 * I will describe internally what we do:
1257 * the ns->lastmap shows how the map last looked when sent to the client.
1258 * in the lastmap structure, there is a cells array, which is set to the
1259 * maximum viewable size (As set in config.h).
1260 * in the cells, there are faces and a count value.
1261 * we use the count value to hold the darkness value. If -1, then this space
1262 * is not viewable.
1263 * we use faces[0] faces[1] faces[2] to hold what the three layers
1264 * look like.
1265 */ 1009 */
1266void 1010void
1267draw_client_map1 (object *pl) 1011draw_client_map (player *pl)
1268{ 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
1269 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1026 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1270 sint16 nx, ny;
1271 int estartlen, eoldlen; 1027 int estartlen, eoldlen;
1272 uint8 eentrysize; 1028 uint8 eentrysize;
1273 uint16 ewhatstart, ewhatflag; 1029 uint16 ewhatstart, ewhatflag;
1274 uint8 extendedinfos; 1030 uint8 extendedinfos;
1275 maptile *m;
1276 1031
1277 client &socket = *pl->contr->ns;
1278
1279 if (!pl->active)
1280 return;
1281
1282 check_map_change (pl->contr); 1032 check_map_change (pl);
1283 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;
1284 1068
1285 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1069 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1286 packet esl; 1070 packet esl;
1287 1071
1288 startlen = sl.length (); 1072 startlen = sl.length ();
… …
1312 ay = 0; 1096 ay = 0;
1313 1097
1314 /* We could do this logic as conditionals in the if statement, 1098 /* We could do this logic as conditionals in the if statement,
1315 * but that started to get a bit messy to look at. 1099 * but that started to get a bit messy to look at.
1316 */ 1100 */
1317 max_x = pl->x + (socket.mapx + 1) / 2; 1101 max_x = ob->x + (socket.mapx + 1) / 2;
1318 max_y = pl->y + (socket.mapy + 1) / 2; 1102 max_y = ob->y + (socket.mapy + 1) / 2;
1319 1103
1320 maptile *plmap = pl->map;
1321
1322 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++)
1323 { 1105 {
1106 sint16 nx, ny;
1107 maptile *m = 0;
1108
1324 ax = 0; 1109 ax = 0;
1325 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++)
1326 { 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
1327 int emask, mask; 1127 int emask, mask;
1328 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1128 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1329 1129
1330 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1130 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1331 1131
1332 /* 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,
1333 * we tell the client as such 1133 * we tell the client as such
1334 */ 1134 */
1335 nx = x;
1336 ny = y;
1337 m = get_map_from_coord (plmap, &nx, &ny);
1338
1339 if (!m) 1135 if (!m)
1340 { 1136 {
1341 /* space is out of map. Update space and clear values 1137 /* space is out of map. Update space and clear values
1342 * 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
1343 * of the map, it shouldn't have a head 1139 * of the map, it shouldn't have a head
… …
1349 } 1145 }
1350 1146
1351 continue; 1147 continue;
1352 } 1148 }
1353 1149
1354 m->touch ();
1355
1356 int d = pl->contr->blocked_los[ax][ay]; 1150 int d = pl->blocked_los[ax][ay];
1357 1151
1358 if (d > 3) 1152 if (d > 3)
1359 { 1153 {
1360 1154
1361 int need_send = 0, count; 1155 int need_send = 0, count;
… …
1424 } 1218 }
1425 1219
1426 lastcell.count = d; 1220 lastcell.count = d;
1427 1221
1428 mapspace &ms = m->at (nx, ny); 1222 mapspace &ms = m->at (nx, ny);
1223 ms.update ();
1429 1224
1430 if (socket.extmap) 1225 if (socket.extmap)
1431 { 1226 {
1432 uint8 stat_hp = 0; 1227 uint8 stat_hp = 0;
1433 uint8 stat_width = 0; 1228 uint8 stat_width = 0;
1434 uint8 flags = 0; 1229 uint8 flags = 0;
1435 UUID player = 0; 1230 tag_t player = 0;
1436 1231
1437 // send hp information, if applicable 1232 // send hp information, if applicable
1438 if (object *op = ms.faces_obj [0]) 1233 if (object *op = ms.faces_obj [0])
1234 if (op->is_head () && !op->invisible)
1439 { 1235 {
1440 if (op->head || op->invisible) 1236 if (op->stats.maxhp > op->stats.hp
1441 ; // do not show 1237 && op->stats.maxhp > 0
1442 else if (op->type == PLAYER 1238 && (op->type == PLAYER
1239 || op->type == DOOR // does not work, have maxhp 0
1443 || 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)))
1444 {
1445 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1446 { 1241 {
1447 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1242 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1448 stat_width = op->arch->tail_x; 1243 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1449 } 1244 }
1450 }
1451 1245
1452 if (op->msg && op->msg[0] == '@') 1246 if (op->msg && op->msg[0] == '@')
1453 flags |= 1; 1247 flags |= 1;
1454 1248
1455 if (op->type == PLAYER && op != pl) 1249 if (op->type == PLAYER && op != ob)
1456 player = op->count; 1250 player = op->count;
1457 } 1251 }
1458 1252
1459 if (lastcell.stat_hp != stat_hp) 1253 if (lastcell.stat_hp != stat_hp)
1460 { 1254 {
1461 lastcell.stat_hp = stat_hp; 1255 lastcell.stat_hp = stat_hp;
1462 1256
… …
1481 1275
1482 mask |= 0x8; 1276 mask |= 0x8;
1483 *last_ext |= 0x80; 1277 *last_ext |= 0x80;
1484 last_ext = &sl[sl.length ()]; 1278 last_ext = &sl[sl.length ()];
1485 1279
1486 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1280 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1487 } 1281 }
1488 1282
1489 if (lastcell.flags != flags) 1283 if (lastcell.flags != flags)
1490 { 1284 {
1491 lastcell.flags = flags; 1285 lastcell.flags = flags;
… …
1504 1298
1505 /* Middle face */ 1299 /* Middle face */
1506 if (update_space (sl, socket, ms, lastcell, 1)) 1300 if (update_space (sl, socket, ms, lastcell, 1))
1507 mask |= 0x2; 1301 mask |= 0x2;
1508 1302
1509 if (ms.player () == pl 1303 if (ms.player () == ob
1510 && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) 1304 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1511 { 1305 {
1512 // force player to be visible to himself if invisible 1306 // force player to be visible to himself if invisible
1513 if (lastcell.faces[0] != pl->face) 1307 if (lastcell.faces[0] != ob->face)
1514 { 1308 {
1515 lastcell.faces[0] = pl->face; 1309 lastcell.faces[0] = ob->face;
1516 1310
1517 mask |= 0x1; 1311 mask |= 0x1;
1518 sl << uint16 (pl->face); 1312 sl << uint16 (ob->face);
1519 1313
1520 socket.send_faces (pl); 1314 socket.send_faces (ob);
1521 } 1315 }
1522 } 1316 }
1523 /* Top face */ 1317 /* Top face */
1524 else if (update_space (sl, socket, ms, lastcell, 0)) 1318 else if (update_space (sl, socket, ms, lastcell, 0))
1525 mask |= 0x1; 1319 mask |= 0x1;
1526
1527 1320
1528 /* 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
1529 * space by checking the mask. If so, update the mask. 1322 * space by checking the mask. If so, update the mask.
1530 * 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
1531 * value, so we don't send those bits. 1324 * value, so we don't send those bits.
… …
1565 } 1358 }
1566 } /* else this is a viewable space */ 1359 } /* else this is a viewable space */
1567 } /* for x loop */ 1360 } /* for x loop */
1568 } /* for y loop */ 1361 } /* for y loop */
1569 1362
1363 socket.flush_fx ();
1364
1570 /* Verify that we in fact do need to send this */ 1365 /* Verify that we in fact do need to send this */
1571 if (socket.ext_mapinfos) 1366 if (socket.ext_mapinfos)
1572 { 1367 {
1573 if (!(sl.length () > startlen || socket.sent_scroll)) 1368 if (!(sl.length () > startlen || socket.sent_scroll))
1574 { 1369 {
… …
1588 socket.send_packet (sl); 1383 socket.send_packet (sl);
1589 socket.sent_scroll = 0; 1384 socket.sent_scroll = 0;
1590 } 1385 }
1591} 1386}
1592 1387
1593/**
1594 * Draws client map.
1595 */
1596void
1597draw_client_map (object *pl)
1598{
1599 int i, j;
1600 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1601 int mflags;
1602 struct Map newmap;
1603 maptile *m, *pm;
1604
1605 if (pl->type != PLAYER)
1606 {
1607 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1608 return;
1609 }
1610
1611 pm = pl->map;
1612
1613 /* If player is just joining the game, he isn't here yet, so the map
1614 * can get swapped out. If so, don't try to send them a map. All will
1615 * be OK once they really log in.
1616 */
1617 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1618 return;
1619
1620 memset (&newmap, 0, sizeof (struct Map));
1621
1622 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1623 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1624 {
1625 ax = i;
1626 ay = j;
1627 m = pm;
1628 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1629
1630 if (mflags & P_OUT_OF_MAP)
1631 continue;
1632
1633 /* If a map is visible to the player, we don't want to swap it out
1634 * just to reload it. This should really call something like
1635 * swap_map, but this is much more efficient and 'good enough'
1636 */
1637 if (mflags & P_NEW_MAP)
1638 m->timeout = 50;
1639 }
1640
1641 /* do LOS after calls to update_position */
1642 if (pl->contr->do_los)
1643 {
1644 update_los (pl);
1645 pl->contr->do_los = 0;
1646 }
1647
1648 /* Big maps need a different drawing mechanism to work */
1649 draw_client_map1 (pl);
1650}
1651
1652
1653/*****************************************************************************/ 1388/*****************************************************************************/
1654
1655/* 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*/
1656
1657/* 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 */
1658
1659/* manage it ! */ 1391/* manage it ! */
1660
1661/*****************************************************************************/ 1392/*****************************************************************************/
1662void 1393void
1663send_plugin_custom_message (object *pl, char *buf) 1394send_plugin_custom_message (object *pl, char *buf)
1664{ 1395{
1665 pl->contr->ns->send_packet (buf); 1396 pl->contr->ns->send_packet (buf);
… …
1676 sl << "replyinfo skill_info\n"; 1407 sl << "replyinfo skill_info\n";
1677 1408
1678 for (int i = 1; i < NUM_SKILLS; i++) 1409 for (int i = 1; i < NUM_SKILLS; i++)
1679 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]);
1680 1411
1681 if (sl.length () >= MAXSOCKBUF) 1412 if (sl.length () > MAXSOCKBUF)
1682 { 1413 {
1683 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1414 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1684 fatal (0); 1415 fatal (0);
1685 } 1416 }
1686 1417
… …
1699 sl << "replyinfo spell_paths\n"; 1430 sl << "replyinfo spell_paths\n";
1700 1431
1701 for (int i = 0; i < NRSPELLPATHS; i++) 1432 for (int i = 0; i < NRSPELLPATHS; i++)
1702 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1433 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1703 1434
1704 if (sl.length () >= MAXSOCKBUF) 1435 if (sl.length () > MAXSOCKBUF)
1705 { 1436 {
1706 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1437 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1707 fatal (0); 1438 fatal (0);
1708 } 1439 }
1709 1440
… …
1817 if (!spell->face) 1548 if (!spell->face)
1818 { 1549 {
1819 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);
1820 spell->face = face_find ("burnout.x11", blank_face); 1551 spell->face = face_find ("burnout.x11", blank_face);
1821 } 1552 }
1553
1554 pl->ns->send_face (spell->face);
1822 1555
1823 /* send the current values */ 1556 /* send the current values */
1824 sl << uint32 (spell->count) 1557 sl << uint32 (spell->count)
1825 << uint16 (spell->level) 1558 << uint16 (spell->level)
1826 << uint16 (spell->casting_time) 1559 << uint16 (spell->casting_time)
… …
1862 * 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
1863 * 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,
1864 * 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,
1865 * 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
1866 */ 1599 */
1600 if (spell->type != SPELL)
1601 continue;
1602
1867 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1603 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1868 * 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
1869 * 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
1870 * like it will fix this 1606 * like it will fix this
1871 */ 1607 */
1872 if (spell->type != SPELL)
1873 continue;
1874
1875 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))))
1876 { 1609 {
1610 pl->ns->flush_fx ();
1877 pl->ns->send_packet (sl); 1611 pl->ns->send_packet (sl);
1878 1612
1879 sl.reset (); 1613 sl.reset ();
1880 sl << "addspell "; 1614 sl << "addspell ";
1881 } 1615 }
… …
1889 return; 1623 return;
1890 } 1624 }
1891 else 1625 else
1892 append_spell (pl, sl, spell); 1626 append_spell (pl, sl, spell);
1893 1627
1894 if (sl.length () >= MAXSOCKBUF) 1628 if (sl.length () > MAXSOCKBUF)
1895 { 1629 {
1896 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1630 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1897 fatal (0); 1631 fatal (0);
1898 } 1632 }
1899 1633
1900 /* finally, we can send the packet */ 1634 /* finally, we can send the packet */
1635 pl->ns->flush_fx ();
1901 pl->ns->send_packet (sl); 1636 pl->ns->send_packet (sl);
1902} 1637}
1903 1638

Diff Legend

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