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.97 by root, Thu May 17 14:14:56 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 * Copyright (C) 2001 Mark Wedel 5 * Copyright (C) 2001 Mark Wedel
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 * 7 *
… …
148{ 148{
149 client &socket = *pl->ns; 149 client &socket = *pl->ns;
150 object *ob = pl->ob; 150 object *ob = pl->ob;
151 char buf[MAX_BUF]; /* eauugggh */ 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 snprintf (buf, MAX_BUF, "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, ob->map->width, ob->map->height, &ob->map->path);
181 } 171 }
182 else 172 else
… …
331 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token); 321 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
332 else if (map && map->path[0]) 322 else if (map && map->path[0])
333 { 323 {
334 int flags = 0; 324 int flags = 0;
335 325
336 if (map->tile_path[0]) 326 if (map->tile_path[0]) flags |= 1;
337 flags |= 1;
338 if (map->tile_path[1]) 327 if (map->tile_path[1]) flags |= 2;
339 flags |= 2;
340 if (map->tile_path[2]) 328 if (map->tile_path[2]) flags |= 4;
341 flags |= 4;
342 if (map->tile_path[3]) 329 if (map->tile_path[3]) flags |= 8;
343 flags |= 8;
344 330
345 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); 331 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
346 } 332 }
347 else 333 else
348 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 334 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
… …
351 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 337 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
352 338
353 pl->ns->send_packet (bigbuf); 339 pl->ns->send_packet (bigbuf);
354} 340}
355 341
356/** This is the Setup cmd - easy first implementation */ 342/** This is the Setup cmd */
357void 343void
358SetUp (char *buf, int len, client * ns) 344SetUp (char *buf, int len, client * ns)
359{ 345{
360 int s, slen; 346 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} 347}
566 348
567/** 349/**
568 * The client has requested to be added to the game. 350 * 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. 351 * 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. 353 * it either has to be here or init_sockets needs to be exported.
572 */ 354 */
573void 355void
574AddMeCmd (char *buf, int len, client *ns) 356AddMeCmd (char *buf, int len, client *ns)
575{ 357{
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)); 358 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
612} 359}
613 360
614/** Reply to ExtendedInfos command */ 361/** Reply to ExtendedInfos command */
615void 362void
… …
743 */ 490 */
744void 491void
745AskSmooth (char *buf, int len, client *ns) 492AskSmooth (char *buf, int len, client *ns)
746{ 493{
747 ns->send_face (atoi (buf)); 494 ns->send_face (atoi (buf));
495 ns->flush_fx ();
748} 496}
749 497
750/** 498/**
751 * This handles the general commands from the client (ie, north, fire, cast, 499 * This handles the general commands from the client (ie, north, fire, cast,
752 * etc.) 500 * etc.)
… …
855 { 603 {
856 case ST_PLAYING: 604 case ST_PLAYING:
857 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 605 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
858 break; 606 break;
859 607
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 */ 608 case ST_GET_PARTY_PASSWORD: /* Get password for party */
865 receive_party_password (pl->ob, 13); 609 receive_party_password (pl->ob, 13);
866 break; 610 break;
867 611
868 default: 612 default:
… …
907 651
908 cp = strchr (cp + 1, ' '); 652 cp = strchr (cp + 1, ' ');
909 653
910 if (cp) 654 if (cp)
911 { 655 {
912 assign (ns->version, cp + 1); 656 ns->version = cp + 1;
913 657
914 if (ns->sc_version < 1026) 658 if (ns->sc_version < 1026)
915 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 659 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
916 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 660 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
917 } 661 }
… …
977/** 721/**
978 * Asks the client to query the user. This way, the client knows 722 * 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) 723 * it needs to send something back (vs just printing out a message)
980 */ 724 */
981void 725void
982send_query (client *ns, uint8 flags, char *text) 726send_query (client *ns, uint8 flags, const char *text)
983{ 727{
984 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 728 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
729}
730
731/**
732 * Get player's current range attack in obuf.
733 */
734static void
735rangetostring (player *pl, char *obuf)
736{
737 dynbuf_text buf;
738
739 if (pl->ranged_ob)
740 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
741
742 if (pl->combat_ob)
743 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
744
745 //TODO: maybe golem should become the current_weapon, quite simply?
746 if (pl->golem)
747 buf << " Golem*: " << pl->golem->name;
748
749 buf.linearise (obuf);
750 obuf [buf.size ()] = 0;
985} 751}
986 752
987#define AddIfInt64(Old,New,Type) if (Old != New) {\ 753#define AddIfInt64(Old,New,Type) if (Old != New) {\
988 Old = New; \ 754 Old = New; \
989 sl << uint8 (Type) << uint64 (New); \ 755 sl << uint8 (Type) << uint64 (New); \
… …
1096 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 862 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); 863 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); 864 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1099 } 865 }
1100 866
1101 rangetostring (ob, buf); /* we want use the new fire & run system in new client */ 867 rangetostring (pl, buf); /* we want use the new fire & run system in new client */
1102 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 868 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1103 set_title (ob, buf); 869 set_title (ob, buf);
1104 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 870 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1105 871
1106 /* Only send it away if we have some actual data */ 872 /* Only send it away if we have some actual data */
… …
1427 1193
1428 mapspace &ms = m->at (nx, ny); 1194 mapspace &ms = m->at (nx, ny);
1429 1195
1430 if (socket.extmap) 1196 if (socket.extmap)
1431 { 1197 {
1432 uint8 stat_hp = 0; 1198 uint8 stat_hp = 0;
1433 uint8 stat_width = 0; 1199 uint8 stat_width = 0;
1434 uint8 flags = 0; 1200 uint8 flags = 0;
1435 UUID player = 0; 1201 tag_t player = 0;
1436 1202
1437 // send hp information, if applicable 1203 // send hp information, if applicable
1438 if (object *op = ms.faces_obj [0]) 1204 if (object *op = ms.faces_obj [0])
1439 { 1205 {
1440 if (op->head || op->invisible) 1206 if (op->head || op->invisible)
… …
1481 1247
1482 mask |= 0x8; 1248 mask |= 0x8;
1483 *last_ext |= 0x80; 1249 *last_ext |= 0x80;
1484 last_ext = &sl[sl.length ()]; 1250 last_ext = &sl[sl.length ()];
1485 1251
1486 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1252 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1487 } 1253 }
1488 1254
1489 if (lastcell.flags != flags) 1255 if (lastcell.flags != flags)
1490 { 1256 {
1491 lastcell.flags = flags; 1257 lastcell.flags = flags;
… …
1564 esl.reset (eoldlen); 1330 esl.reset (eoldlen);
1565 } 1331 }
1566 } /* else this is a viewable space */ 1332 } /* else this is a viewable space */
1567 } /* for x loop */ 1333 } /* for x loop */
1568 } /* for y loop */ 1334 } /* for y loop */
1335
1336 socket.flush_fx ();
1569 1337
1570 /* Verify that we in fact do need to send this */ 1338 /* Verify that we in fact do need to send this */
1571 if (socket.ext_mapinfos) 1339 if (socket.ext_mapinfos)
1572 { 1340 {
1573 if (!(sl.length () > startlen || socket.sent_scroll)) 1341 if (!(sl.length () > startlen || socket.sent_scroll))

Diff Legend

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