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.114 by root, Tue Jul 10 06:05:55 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT 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 <crossfire@schmorp.de>
23 */ 22 */
24 23
25/** 24/**
26 * \file 25 * \file
27 * Client handling. 26 * Client handling.
… …
132static void 131static void
133clear_map (player *pl) 132clear_map (player *pl)
134{ 133{
135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 134 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
136 135
136 pl->ns->force_newmap = false;
137
137 if (pl->ns->newmapcmd == 1) 138 if (pl->ns->newmapcmd == 1)
138 pl->ns->send_packet ("newmap"); 139 pl->ns->send_packet ("newmap");
139 140
140 pl->ns->floorbox_reset (); 141 pl->ns->floorbox_reset ();
141} 142}
… …
143/** check for map/region change and send new map data */ 144/** check for map/region change and send new map data */
144static void 145static void
145check_map_change (player *pl) 146check_map_change (player *pl)
146{ 147{
147 client &socket = *pl->ns; 148 client &socket = *pl->ns;
148 object *ob = pl->ob; 149 object *ob = pl->observe;
149 char buf[MAX_BUF]; /* eauugggh */
150 150
151 if (socket.current_map != ob->map) 151 if (socket.current_map != ob->map || socket.force_newmap)
152 { 152 {
153 clear_map (pl);
153 socket.current_map = ob->map; 154 socket.current_map = ob->map;
154
155 clear_map (pl);
156 155
157 if (socket.mapinfocmd) 156 if (socket.mapinfocmd)
158 { 157 {
159 if (ob->map && ob->map->path[0]) 158 if (ob->map && ob->map->path[0])
160 { 159 {
161 int flags = 0; 160 int flags = 0;
162 161
163 if (ob->map->tile_path[0]) 162 if (ob->map->tile_path[0]) flags |= 1;
164 flags |= 1;
165 if (ob->map->tile_path[1]) 163 if (ob->map->tile_path[1]) flags |= 2;
166 flags |= 2;
167 if (ob->map->tile_path[2]) 164 if (ob->map->tile_path[2]) flags |= 4;
168 flags |= 4;
169 if (ob->map->tile_path[3]) 165 if (ob->map->tile_path[3]) flags |= 8;
170 flags |= 8;
171 166
172 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 167 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); 168 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
169 ob->map->width, ob->map->height, &ob->map->path);
174 } 170 }
175 else 171 else
176 snprintf (buf, MAX_BUF, "mapinfo current");
177
178 socket.send_packet (buf); 172 socket.send_packet ("mapinfo current");
179 } 173 }
180 } 174 }
181 else if (socket.current_x != ob->x || socket.current_y != ob->y) 175 else if (socket.current_x != ob->x || socket.current_y != ob->y)
182 { 176 {
183 int dx = ob->x - socket.current_x; 177 int dx = ob->x - socket.current_x;
… …
207 * RequestInfo is sort of a meta command. There is some specific 201 * RequestInfo is sort of a meta command. There is some specific
208 * request of information, but we call other functions to provide 202 * request of information, but we call other functions to provide
209 * that information. 203 * that information.
210 */ 204 */
211void 205void
212RequestInfo (char *buf, int len, client * ns) 206RequestInfo (char *buf, int len, client *ns)
213{ 207{
214 char *params = NULL, *cp; 208 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 209
227 /* find the first space, make it null, and update the 210 /* find the first space, make it null, and update the
228 * params pointer. 211 * params pointer.
229 */ 212 */
230 for (cp = buf; *cp != '\0'; cp++) 213 for (params = buf; *params; params++)
231 if (*cp == ' ') 214 if (*params == ' ')
232 { 215 {
233 *cp = '\0';
234 params = cp + 1; 216 *params++ = 0;
235 break; 217 break;
236 } 218 }
237 219
238 if (!strcmp (buf, "image_info")) 220 if (!strcmp (buf, "image_info"))
239 send_image_info (ns, params); 221 send_image_info (ns, params);
… …
242 else if (!strcmp (buf, "skill_info")) 224 else if (!strcmp (buf, "skill_info"))
243 send_skill_info (ns, params); 225 send_skill_info (ns, params);
244 else if (!strcmp (buf, "spell_paths")) 226 else if (!strcmp (buf, "spell_paths"))
245 send_spell_paths (ns, params); 227 send_spell_paths (ns, params);
246 else 228 else
247 ns->send_packet (bigbuf, len); 229 {
230 // undo tokenisation above and send replyinfo with the request unchanged
231 if (*params)
232 *--params = ' ';
233
234 ns->send_packet_printf ("replyinfo %s", buf);
235 }
248} 236}
249 237
250void 238void
251ExtCmd (char *buf, int len, player *pl) 239ExtCmd (char *buf, int len, player *pl)
252{ 240{
… …
324 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token); 312 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
325 else if (map && map->path[0]) 313 else if (map && map->path[0])
326 { 314 {
327 int flags = 0; 315 int flags = 0;
328 316
329 if (map->tile_path[0]) 317 if (map->tile_path[0]) flags |= 1;
330 flags |= 1;
331 if (map->tile_path[1]) 318 if (map->tile_path[1]) flags |= 2;
332 flags |= 2;
333 if (map->tile_path[2]) 319 if (map->tile_path[2]) flags |= 4;
334 flags |= 4;
335 if (map->tile_path[3]) 320 if (map->tile_path[3]) flags |= 8;
336 flags |= 8;
337 321
338 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); 322 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
339 } 323 }
340 else 324 else
341 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 325 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
… …
344 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 328 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
345 329
346 pl->ns->send_packet (bigbuf); 330 pl->ns->send_packet (bigbuf);
347} 331}
348 332
349/** This is the Setup cmd - easy first implementation */ 333/** This is the Setup cmd */
350void 334void
351SetUp (char *buf, int len, client * ns) 335SetUp (char *buf, int len, client * ns)
352{ 336{
353 int s, slen; 337 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} 338}
559 339
560/** 340/**
561 * The client has requested to be added to the game. 341 * 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. 342 * 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. 344 * it either has to be here or init_sockets needs to be exported.
565 */ 345 */
566void 346void
567AddMeCmd (char *buf, int len, client *ns) 347AddMeCmd (char *buf, int len, client *ns)
568{ 348{
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)); 349 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
590} 350}
591 351
592/** Reply to ExtendedInfos command */ 352/** Reply to ExtendedInfos command */
593void 353void
… …
704 464
705 ns->send_packet (cmdback); 465 ns->send_packet (cmdback);
706} 466}
707 467
708/** 468/**
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, 469 * This handles the general commands from the client (ie, north, fire, cast,
730 * etc.) 470 * etc.)
731 */ 471 */
732void 472void
733PlayerCmd (char *buf, int len, player *pl) 473PlayerCmd (char *buf, int len, player *pl)
… …
754 * commands. 494 * commands.
755 */ 495 */
756 pl->count = 0; 496 pl->count = 0;
757} 497}
758 498
759
760/** 499/**
761 * This handles the general commands from the client (ie, north, fire, cast, 500 * 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 501 * 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 502 * 'ncom' method which gives more information back to the client so it
764 * can throttle. 503 * can throttle.
… …
766void 505void
767NewPlayerCmd (char *buf, int len, player *pl) 506NewPlayerCmd (char *buf, int len, player *pl)
768{ 507{
769 if (len <= 6) 508 if (len <= 6)
770 { 509 {
771 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 510 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
772 return; 511 return;
773 } 512 }
774 513
775 uint16 cmdid = net_uint16 ((uint8 *)buf); 514 uint16 cmdid = net_uint16 ((uint8 *)buf);
776 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 515 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
833 { 572 {
834 case ST_PLAYING: 573 case ST_PLAYING:
835 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 574 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
836 break; 575 break;
837 576
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 */ 577 case ST_GET_PARTY_PASSWORD: /* Get password for party */
843 receive_party_password (pl->ob, 13); 578 receive_party_password (pl->ob, 13);
844 break; 579 break;
845 580
846 default: 581 default:
… …
885 620
886 cp = strchr (cp + 1, ' '); 621 cp = strchr (cp + 1, ' ');
887 622
888 if (cp) 623 if (cp)
889 { 624 {
890 assign (ns->version, cp + 1); 625 ns->version = cp + 1;
891 626
892 if (ns->sc_version < 1026) 627 if (ns->sc_version < 1026)
893 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 628 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
894 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 629 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
895 } 630 }
… …
955/** 690/**
956 * Asks the client to query the user. This way, the client knows 691 * 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) 692 * it needs to send something back (vs just printing out a message)
958 */ 693 */
959void 694void
960send_query (client *ns, uint8 flags, char *text) 695send_query (client *ns, uint8 flags, const char *text)
961{ 696{
962 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 697 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
698}
699
700/**
701 * Get player's current range attack in obuf.
702 */
703static void
704rangetostring (player *pl, char *obuf)
705{
706 dynbuf_text buf;
707
708 if (pl->ranged_ob)
709 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
710
711 if (pl->combat_ob)
712 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
713
714#if 0
715 //TODO: remove this when slot system is working, this is only for debugging
716 if (pl->ob->chosen_skill)
717 buf << " Skill*: " << pl->ob->chosen_skill->name;
718#endif
719
720 //TODO: maybe golem should become the current_weapon, quite simply?
721 if (pl->golem)
722 buf << " Golem*: " << pl->golem->name;
723
724 buf << '\0';
725 buf.linearise (obuf);
963} 726}
964 727
965#define AddIfInt64(Old,New,Type) if (Old != New) {\ 728#define AddIfInt64(Old,New,Type) if (Old != New) {\
966 Old = New; \ 729 Old = New; \
967 sl << uint8 (Type) << uint64 (New); \ 730 sl << uint8 (Type) << uint64 (New); \
… …
975#define AddIfShort(Old,New,Type) if (Old != New) {\ 738#define AddIfShort(Old,New,Type) if (Old != New) {\
976 Old = New; \ 739 Old = New; \
977 sl << uint8 (Type) << uint16 (New); \ 740 sl << uint8 (Type) << uint16 (New); \
978 } 741 }
979 742
980#define AddIfFloat(Old,New,Type) if (Old != New) {\ 743#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
981 Old = New; \ 744 Old = New; \
982 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 745 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
983 } 746 }
984 747
985#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 748#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
986 free(Old); Old = strdup (New);\ 749 free(Old); Old = strdup (New);\
987 sl << uint8 (Type) << data8 (New); \ 750 sl << uint8 (Type) << data8 (New); \
… …
1001 764
1002 client *ns = pl->ns; 765 client *ns = pl->ns;
1003 if (!ns) 766 if (!ns)
1004 return; 767 return;
1005 768
1006 object *ob = pl->ob; 769 object *ob = pl->observe;
1007 if (!ob) 770 if (!ob)
1008 return; 771 return;
772
773 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
1009 774
1010 packet sl ("stats"); 775 packet sl ("stats");
1011 776
1012 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 777 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1013 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 778 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
1022 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 787 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1023 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 788 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1024 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 789 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1025 790
1026 for (int s = 0; s < NUM_SKILLS; s++) 791 for (int s = 0; s < NUM_SKILLS; s++)
1027 if (object *skill = pl->last_skill_ob[s]) 792 if (object *skill = opl->last_skill_ob[s])
1028 if (skill->stats.exp != ns->last_skill_exp [s]) 793 if (skill->stats.exp != ns->last_skill_exp [s])
1029 { 794 {
1030 ns->last_skill_exp [s] = skill->stats.exp; 795 ns->last_skill_exp [s] = skill->stats.exp;
1031 796
1032 /* Always send along the level if exp changes. This is only 797 /* Always send along the level if exp changes. This is only
… …
1040 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 805 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1041 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 806 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1042 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 807 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1043 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 808 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1044 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 809 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1045 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 810 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1046 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 811 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1047 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 812 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); 813 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1049 814
1050 flags = 0; 815 flags = 0;
1051 816
1052 if (pl->fire_on) 817 if (opl->fire_on)
1053 flags |= SF_FIREON; 818 flags |= SF_FIREON;
1054 819
1055 if (pl->run_on) 820 if (opl->run_on)
1056 flags |= SF_RUNON; 821 flags |= SF_RUNON;
1057 822
1058 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 823 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1059 824
1060 if (ns->sc_version < 1025) 825 if (ns->sc_version < 1025)
… …
1074 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 839 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); 840 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); 841 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1077 } 842 }
1078 843
1079 rangetostring (ob, buf); /* we want use the new fire & run system in new client */ 844 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
1080 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 845 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1081 set_title (ob, buf); 846 set_title (ob, buf);
1082 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 847 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1083 848
1084 /* Only send it away if we have some actual data */ 849 /* Only send it away if we have some actual data */
… …
1218{ 983{
1219 prefetch_surrounding_maps (op->map, 3); 984 prefetch_surrounding_maps (op->map, 3);
1220} 985}
1221 986
1222/** 987/**
1223 * This function uses the new map1 protocol command to send the map 988 * 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 */ 989 */
1244void 990void
1245draw_client_map1 (object *pl) 991draw_client_map (player *pl)
1246{ 992{
993 object *ob = pl->observe;
994 if (!ob->active)
995 return;
996
997 maptile *plmap = ob->map;
998
999 /* If player is just joining the game, he isn't here yet, so the map
1000 * can get swapped out. If so, don't try to send them a map. All will
1001 * be OK once they really log in.
1002 */
1003 if (!plmap || plmap->in_memory != MAP_IN_MEMORY)
1004 return;
1005
1247 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1006 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1248 sint16 nx, ny;
1249 int estartlen, eoldlen; 1007 int estartlen, eoldlen;
1250 uint8 eentrysize; 1008 uint8 eentrysize;
1251 uint16 ewhatstart, ewhatflag; 1009 uint16 ewhatstart, ewhatflag;
1252 uint8 extendedinfos; 1010 uint8 extendedinfos;
1253 maptile *m;
1254 1011
1255 client &socket = *pl->contr->ns;
1256
1257 if (!pl->active)
1258 return;
1259
1260 check_map_change (pl->contr); 1012 check_map_change (pl);
1261 prefetch_surrounding_maps (pl); 1013 prefetch_surrounding_maps (pl->ob);
1014
1015 /* do LOS after calls to update_position */
1016 if (ob != pl->ob)
1017 clear_los (pl);
1018 else if (pl->do_los)
1019 {
1020 update_los (ob);
1021 pl->do_los = 0;
1022 }
1023
1024 /**
1025 * This function uses the new map1 protocol command to send the map
1026 * to the client. It is necessary because the old map command supports
1027 * a maximum map size of 15x15.
1028 * This function is much simpler than the old one. This is because
1029 * the old function optimized to send as few face identifiers as possible,
1030 * at the expense of sending more coordinate location (coordinates were
1031 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1032 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1033 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1034 * and use the other 4 bits for other informatiion. For full documentation
1035 * of what we send, see the doc/Protocol file.
1036 * I will describe internally what we do:
1037 * the ns->lastmap shows how the map last looked when sent to the client.
1038 * in the lastmap structure, there is a cells array, which is set to the
1039 * maximum viewable size (As set in config.h).
1040 * in the cells, there are faces and a count value.
1041 * we use the count value to hold the darkness value. If -1, then this space
1042 * is not viewable.
1043 * we use faces[0] faces[1] faces[2] to hold what the three layers
1044 * look like.
1045 */
1046
1047 client &socket = *pl->ns;
1262 1048
1263 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1049 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1264 packet esl; 1050 packet esl;
1265 1051
1266 startlen = sl.length (); 1052 startlen = sl.length ();
… …
1290 ay = 0; 1076 ay = 0;
1291 1077
1292 /* We could do this logic as conditionals in the if statement, 1078 /* We could do this logic as conditionals in the if statement,
1293 * but that started to get a bit messy to look at. 1079 * but that started to get a bit messy to look at.
1294 */ 1080 */
1295 max_x = pl->x + (socket.mapx + 1) / 2; 1081 max_x = ob->x + (socket.mapx + 1) / 2;
1296 max_y = pl->y + (socket.mapy + 1) / 2; 1082 max_y = ob->y + (socket.mapy + 1) / 2;
1297 1083
1298 maptile *plmap = pl->map;
1299
1300 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1084 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1301 { 1085 {
1086 sint16 nx, ny;
1087 maptile *m = 0;
1088
1302 ax = 0; 1089 ax = 0;
1303 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1090 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1304 { 1091 {
1092 // check to see if we can simply go one right quickly
1093 ++nx;
1094 if (m && nx >= m->width)
1095 m = 0;
1096
1097 if (!m)
1098 {
1099 nx = x; ny = y; m = plmap;
1100
1101 if (!xy_normalise (m, nx, ny))
1102 m = 0;
1103 }
1104
1305 int emask, mask; 1105 int emask, mask;
1306 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1106 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1307 1107
1308 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1108 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1309 1109
1310 /* If the coordinates are not valid, or it is too dark to see, 1110 /* If the coordinates are not valid, or it is too dark to see,
1311 * we tell the client as such 1111 * we tell the client as such
1312 */ 1112 */
1313 nx = x;
1314 ny = y;
1315 m = get_map_from_coord (plmap, &nx, &ny);
1316
1317 if (!m) 1113 if (!m)
1318 { 1114 {
1319 /* space is out of map. Update space and clear values 1115 /* space is out of map. Update space and clear values
1320 * if this hasn't already been done. If the space is out 1116 * if this hasn't already been done. If the space is out
1321 * of the map, it shouldn't have a head 1117 * of the map, it shouldn't have a head
… …
1329 continue; 1125 continue;
1330 } 1126 }
1331 1127
1332 m->touch (); 1128 m->touch ();
1333 1129
1334 int d = pl->contr->blocked_los[ax][ay]; 1130 int d = pl->blocked_los[ax][ay];
1335 1131
1336 if (d > 3) 1132 if (d > 3)
1337 { 1133 {
1338 1134
1339 int need_send = 0, count; 1135 int need_send = 0, count;
… …
1402 } 1198 }
1403 1199
1404 lastcell.count = d; 1200 lastcell.count = d;
1405 1201
1406 mapspace &ms = m->at (nx, ny); 1202 mapspace &ms = m->at (nx, ny);
1203 ms.update ();
1407 1204
1408 if (socket.extmap) 1205 if (socket.extmap)
1409 { 1206 {
1410 uint8 stat_hp = 0; 1207 uint8 stat_hp = 0;
1411 uint8 stat_width = 0; 1208 uint8 stat_width = 0;
1412 uint8 flags = 0; 1209 uint8 flags = 0;
1413 UUID player = 0; 1210 tag_t player = 0;
1414 1211
1415 // send hp information, if applicable 1212 // send hp information, if applicable
1416 if (object *op = ms.faces_obj [0]) 1213 if (object *op = ms.faces_obj [0])
1417 { 1214 {
1418 if (op->head || op->invisible) 1215 if (op->head || op->invisible)
… …
1421 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1218 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1422 { 1219 {
1423 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) 1220 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1424 { 1221 {
1425 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1222 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1426 stat_width = op->arch->tail_x; 1223 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1427 } 1224 }
1428 } 1225 }
1429 1226
1430 if (op->msg && op->msg[0] == '@') 1227 if (op->msg && op->msg[0] == '@')
1431 flags |= 1; 1228 flags |= 1;
1432 1229
1433 if (op->type == PLAYER && op != pl) 1230 if (op->type == PLAYER && op != ob)
1434 player = op->count; 1231 player = op->count;
1435 } 1232 }
1436 1233
1437 if (lastcell.stat_hp != stat_hp) 1234 if (lastcell.stat_hp != stat_hp)
1438 { 1235 {
… …
1459 1256
1460 mask |= 0x8; 1257 mask |= 0x8;
1461 *last_ext |= 0x80; 1258 *last_ext |= 0x80;
1462 last_ext = &sl[sl.length ()]; 1259 last_ext = &sl[sl.length ()];
1463 1260
1464 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1261 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1465 } 1262 }
1466 1263
1467 if (lastcell.flags != flags) 1264 if (lastcell.flags != flags)
1468 { 1265 {
1469 lastcell.flags = flags; 1266 lastcell.flags = flags;
… …
1482 1279
1483 /* Middle face */ 1280 /* Middle face */
1484 if (update_space (sl, socket, ms, lastcell, 1)) 1281 if (update_space (sl, socket, ms, lastcell, 1))
1485 mask |= 0x2; 1282 mask |= 0x2;
1486 1283
1487 if (ms.player () == pl 1284 if (ms.player () == ob
1488 && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) 1285 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1489 { 1286 {
1490 // force player to be visible to himself if invisible 1287 // force player to be visible to himself if invisible
1491 if (lastcell.faces[0] != pl->face) 1288 if (lastcell.faces[0] != ob->face)
1492 { 1289 {
1493 lastcell.faces[0] = pl->face; 1290 lastcell.faces[0] = ob->face;
1494 1291
1495 mask |= 0x1; 1292 mask |= 0x1;
1496 sl << uint16 (pl->face); 1293 sl << uint16 (ob->face);
1497 1294
1498 socket.send_faces (pl); 1295 socket.send_faces (ob);
1499 } 1296 }
1500 } 1297 }
1501 /* Top face */ 1298 /* Top face */
1502 else if (update_space (sl, socket, ms, lastcell, 0)) 1299 else if (update_space (sl, socket, ms, lastcell, 0))
1503 mask |= 0x1; 1300 mask |= 0x1;
1504
1505 1301
1506 /* Check to see if we are in fact sending anything for this 1302 /* Check to see if we are in fact sending anything for this
1507 * space by checking the mask. If so, update the mask. 1303 * space by checking the mask. If so, update the mask.
1508 * if not, reset the len to that from before adding the mask 1304 * if not, reset the len to that from before adding the mask
1509 * value, so we don't send those bits. 1305 * value, so we don't send those bits.
… …
1543 } 1339 }
1544 } /* else this is a viewable space */ 1340 } /* else this is a viewable space */
1545 } /* for x loop */ 1341 } /* for x loop */
1546 } /* for y loop */ 1342 } /* for y loop */
1547 1343
1344 socket.flush_fx ();
1345
1548 /* Verify that we in fact do need to send this */ 1346 /* Verify that we in fact do need to send this */
1549 if (socket.ext_mapinfos) 1347 if (socket.ext_mapinfos)
1550 { 1348 {
1551 if (!(sl.length () > startlen || socket.sent_scroll)) 1349 if (!(sl.length () > startlen || socket.sent_scroll))
1552 { 1350 {
… …
1566 socket.send_packet (sl); 1364 socket.send_packet (sl);
1567 socket.sent_scroll = 0; 1365 socket.sent_scroll = 0;
1568 } 1366 }
1569} 1367}
1570 1368
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/*****************************************************************************/ 1369/*****************************************************************************/
1632
1633/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 1370/* 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 */ 1371/* a player. Of course, the client need to know the command to be able to */
1636
1637/* manage it ! */ 1372/* manage it ! */
1638
1639/*****************************************************************************/ 1373/*****************************************************************************/
1640void 1374void
1641send_plugin_custom_message (object *pl, char *buf) 1375send_plugin_custom_message (object *pl, char *buf)
1642{ 1376{
1643 pl->contr->ns->send_packet (buf); 1377 pl->contr->ns->send_packet (buf);

Diff Legend

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