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.76 by root, Wed Mar 14 13:05:30 2007 UTC vs.
Revision 1.88 by root, Tue Apr 24 00:42:03 2007 UTC

… …
132static void 132static void
133clear_map (player *pl) 133clear_map (player *pl)
134{ 134{
135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
136 136
137 pl->ns->force_newmap = false;
138
137 if (pl->ns->newmapcmd == 1) 139 if (pl->ns->newmapcmd == 1)
138 pl->ns->send_packet ("newmap"); 140 pl->ns->send_packet ("newmap");
139 141
140 pl->ns->floorbox_reset (); 142 pl->ns->floorbox_reset ();
141} 143}
… …
146{ 148{
147 client &socket = *pl->ns; 149 client &socket = *pl->ns;
148 object *ob = pl->ob; 150 object *ob = pl->ob;
149 char buf[MAX_BUF]; /* eauugggh */ 151 char buf[MAX_BUF]; /* eauugggh */
150 152
151 if (socket.current_map != ob->map) 153 if (socket.current_map != ob->map || socket.force_newmap)
152 { 154 {
155 clear_map (pl);
153 socket.current_map = ob->map; 156 socket.current_map = ob->map;
154
155 clear_map (pl);
156 157
157 if (socket.mapinfocmd) 158 if (socket.mapinfocmd)
158 { 159 {
159 if (ob->map && ob->map->path[0]) 160 if (ob->map && ob->map->path[0])
160 { 161 {
… …
344 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
345 346
346 pl->ns->send_packet (bigbuf); 347 pl->ns->send_packet (bigbuf);
347} 348}
348 349
349/** This is the Setup cmd - easy first implementation */ 350/** This is the Setup cmd */
350void 351void
351SetUp (char *buf, int len, client * ns) 352SetUp (char *buf, int len, client * ns)
352{ 353{
353 int s, slen; 354 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} 355}
559 356
560/** 357/**
561 * The client has requested to be added to the game. 358 * 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. 359 * This is what takes care of it. We tell the client how things worked out.
563 * I am not sure if this file is the best place for this function. however, 360 * I am not sure if this file is the best place for this function. however,
564 * 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.
565 */ 362 */
566void 363void
567AddMeCmd (char *buf, int len, client * ns) 364AddMeCmd (char *buf, int len, client *ns)
568{ 365{
569 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 366 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
570} 367}
571 368
572/** Reply to ExtendedInfos command */ 369/** Reply to ExtendedInfos command */
… …
684 481
685 ns->send_packet (cmdback); 482 ns->send_packet (cmdback);
686} 483}
687 484
688/** 485/**
486 * client requested an image. send it rate-limited
487 * before flushing.
488 */
489void
490AskFaceCmd (char *buf, int len, client *ns)
491{
492 ns->askface.push_back (atoi (buf));
493}
494
495/**
689 * Tells client the picture it has to use 496 * Tells client the picture it has to use
690 * to smooth a picture number given as argument. 497 * to smooth a picture number given as argument.
691 */ 498 */
692void 499void
693AskSmooth (char *buf, int len, client *ns) 500AskSmooth (char *buf, int len, client *ns)
694{ 501{
695 ns->send_face (atoi (buf)); 502 ns->send_face (atoi (buf));
503 ns->flush_fx ();
696} 504}
697 505
698/** 506/**
699 * 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,
700 * etc.) 508 * etc.)
… …
803 { 611 {
804 case ST_PLAYING: 612 case ST_PLAYING:
805 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 613 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
806 break; 614 break;
807 615
808 case ST_CHANGE_CLASS:
809 key_change_class (pl->ob, buf[0]);
810 break;
811
812 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 616 case ST_GET_PARTY_PASSWORD: /* Get password for party */
813 receive_party_password (pl->ob, 13); 617 receive_party_password (pl->ob, 13);
814 break; 618 break;
815 619
816 default: 620 default:
… …
925/** 729/**
926 * Asks the client to query the user. This way, the client knows 730 * Asks the client to query the user. This way, the client knows
927 * it needs to send something back (vs just printing out a message) 731 * it needs to send something back (vs just printing out a message)
928 */ 732 */
929void 733void
930send_query (client *ns, uint8 flags, char *text) 734send_query (client *ns, uint8 flags, const char *text)
931{ 735{
932 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 736 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
933} 737}
934 738
935#define AddIfInt64(Old,New,Type) if (Old != New) {\ 739#define AddIfInt64(Old,New,Type) if (Old != New) {\
… …
1251 << uint8 (extendedinfos) 1055 << uint8 (extendedinfos)
1252 << uint8 (eentrysize); 1056 << uint8 (eentrysize);
1253 1057
1254 estartlen = esl.length (); 1058 estartlen = esl.length ();
1255 } 1059 }
1256 else
1257 {
1258 /* suppress compiler warnings */
1259 ewhatstart = 0;
1260 ewhatflag = 0;
1261 estartlen = 0;
1262 }
1263 1060
1264 /* x,y are the real map locations. ax, ay are viewport relative 1061 /* x,y are the real map locations. ax, ay are viewport relative
1265 * locations. 1062 * locations.
1266 */ 1063 */
1267 ay = 0; 1064 ay = 0;
… …
1382 1179
1383 mapspace &ms = m->at (nx, ny); 1180 mapspace &ms = m->at (nx, ny);
1384 1181
1385 if (socket.extmap) 1182 if (socket.extmap)
1386 { 1183 {
1387 uint8 stat_hp = 0; 1184 uint8 stat_hp = 0;
1388 uint8 stat_width = 0; 1185 uint8 stat_width = 0;
1389 uint8 flags = 0; 1186 uint8 flags = 0;
1390 UUID player = 0; 1187 tag_t player = 0;
1391 1188
1392 // send hp information, if applicable 1189 // send hp information, if applicable
1393 if (object *op = ms.faces_obj [0]) 1190 if (object *op = ms.faces_obj [0])
1394 { 1191 {
1395 if (op->head || op->invisible) 1192 if (op->head || op->invisible)
… …
1436 1233
1437 mask |= 0x8; 1234 mask |= 0x8;
1438 *last_ext |= 0x80; 1235 *last_ext |= 0x80;
1439 last_ext = &sl[sl.length ()]; 1236 last_ext = &sl[sl.length ()];
1440 1237
1441 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1238 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1442 } 1239 }
1443 1240
1444 if (lastcell.flags != flags) 1241 if (lastcell.flags != flags)
1445 { 1242 {
1446 lastcell.flags = flags; 1243 lastcell.flags = flags;
… …
1519 esl.reset (eoldlen); 1316 esl.reset (eoldlen);
1520 } 1317 }
1521 } /* else this is a viewable space */ 1318 } /* else this is a viewable space */
1522 } /* for x loop */ 1319 } /* for x loop */
1523 } /* for y loop */ 1320 } /* for y loop */
1321
1322 socket.flush_fx ();
1524 1323
1525 /* Verify that we in fact do need to send this */ 1324 /* Verify that we in fact do need to send this */
1526 if (socket.ext_mapinfos) 1325 if (socket.ext_mapinfos)
1527 { 1326 {
1528 if (!(sl.length () > startlen || socket.sent_scroll)) 1327 if (!(sl.length () > startlen || socket.sent_scroll))

Diff Legend

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