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.87 by root, Thu Apr 19 11:12:46 2007 UTC

… …
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 {
… …
351 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
352 346
353 pl->ns->send_packet (bigbuf); 347 pl->ns->send_packet (bigbuf);
354} 348}
355 349
356/** This is the Setup cmd - easy first implementation */ 350/** This is the Setup cmd */
357void 351void
358SetUp (char *buf, int len, client * ns) 352SetUp (char *buf, int len, client * ns)
359{ 353{
360 int s, slen; 354 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} 355}
566 356
567/** 357/**
568 * The client has requested to be added to the game. 358 * 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. 359 * 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. 361 * it either has to be here or init_sockets needs to be exported.
572 */ 362 */
573void 363void
574AddMeCmd (char *buf, int len, client *ns) 364AddMeCmd (char *buf, int len, client *ns)
575{ 365{
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)); 366 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
612} 367}
613 368
614/** Reply to ExtendedInfos command */ 369/** Reply to ExtendedInfos command */
615void 370void
… …
743 */ 498 */
744void 499void
745AskSmooth (char *buf, int len, client *ns) 500AskSmooth (char *buf, int len, client *ns)
746{ 501{
747 ns->send_face (atoi (buf)); 502 ns->send_face (atoi (buf));
503 ns->flush_fx ();
748} 504}
749 505
750/** 506/**
751 * This handles the general commands from the client (ie, north, fire, cast, 507 * This handles the general commands from the client (ie, north, fire, cast,
752 * etc.) 508 * etc.)
… …
977/** 733/**
978 * Asks the client to query the user. This way, the client knows 734 * 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) 735 * it needs to send something back (vs just printing out a message)
980 */ 736 */
981void 737void
982send_query (client *ns, uint8 flags, char *text) 738send_query (client *ns, uint8 flags, const char *text)
983{ 739{
984 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 740 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
985} 741}
986 742
987#define AddIfInt64(Old,New,Type) if (Old != New) {\ 743#define AddIfInt64(Old,New,Type) if (Old != New) {\
… …
1427 1183
1428 mapspace &ms = m->at (nx, ny); 1184 mapspace &ms = m->at (nx, ny);
1429 1185
1430 if (socket.extmap) 1186 if (socket.extmap)
1431 { 1187 {
1432 uint8 stat_hp = 0; 1188 uint8 stat_hp = 0;
1433 uint8 stat_width = 0; 1189 uint8 stat_width = 0;
1434 uint8 flags = 0; 1190 uint8 flags = 0;
1435 UUID player = 0; 1191 tag_t player = 0;
1436 1192
1437 // send hp information, if applicable 1193 // send hp information, if applicable
1438 if (object *op = ms.faces_obj [0]) 1194 if (object *op = ms.faces_obj [0])
1439 { 1195 {
1440 if (op->head || op->invisible) 1196 if (op->head || op->invisible)
… …
1481 1237
1482 mask |= 0x8; 1238 mask |= 0x8;
1483 *last_ext |= 0x80; 1239 *last_ext |= 0x80;
1484 last_ext = &sl[sl.length ()]; 1240 last_ext = &sl[sl.length ()];
1485 1241
1486 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1242 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1487 } 1243 }
1488 1244
1489 if (lastcell.flags != flags) 1245 if (lastcell.flags != flags)
1490 { 1246 {
1491 lastcell.flags = flags; 1247 lastcell.flags = flags;
… …
1564 esl.reset (eoldlen); 1320 esl.reset (eoldlen);
1565 } 1321 }
1566 } /* else this is a viewable space */ 1322 } /* else this is a viewable space */
1567 } /* for x loop */ 1323 } /* for x loop */
1568 } /* for y loop */ 1324 } /* for y loop */
1325
1326 socket.flush_fx ();
1569 1327
1570 /* Verify that we in fact do need to send this */ 1328 /* Verify that we in fact do need to send this */
1571 if (socket.ext_mapinfos) 1329 if (socket.ext_mapinfos)
1572 { 1330 {
1573 if (!(sl.length () > startlen || socket.sent_scroll)) 1331 if (!(sl.length () > startlen || socket.sent_scroll))

Diff Legend

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