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.75 by root, Wed Mar 14 04:12:29 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 sprintf (tmpbuf, "%d", ns->faceset);
465 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
466 /* if the client is using faceset, it knows about image2 command */
467 ns->image2 = 1;
468 }
469 else if (!strcmp (cmd, "itemcmd"))
470 {
471 /* Version of the item protocol command to use. Currently,
472 * only supported versions are 1 and 2. Using a numeric
473 * value will make it very easy to extend this in the future.
474 */
475 char tmpbuf[20];
476 int q = atoi (param);
477
478 if (q < 1 || q > 2)
479 {
480 strcpy (tmpbuf, "FALSE");
481 }
482 else
483 {
484 ns->itemcmd = q;
485 sprintf (tmpbuf, "%d", ns->itemcmd);
486 }
487 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
488 }
489 else if (!strcmp (cmd, "mapsize"))
490 {
491 int x, y = 0;
492 char tmpbuf[MAX_BUF], *cp;
493
494 x = atoi (param);
495 for (cp = param; *cp != 0; cp++)
496 if (*cp == 'x' || *cp == 'X')
497 {
498 y = atoi (cp + 1);
499 break;
500 }
501
502 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
503 {
504 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
505 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
506 }
507 else
508 {
509 ns->mapx = x;
510 ns->mapy = y;
511 /* better to send back what we are really using and not the
512 * param as given to us in case it gets parsed differently.
513 */
514 sprintf (tmpbuf, "%dx%d", x, y);
515 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
516 /* If beyond this size and still using orig map command, need to
517 * go to map1cmd.
518 */
519 if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
520 ns->mapmode = Map1Cmd;
521 }
522 }
523 else if (!strcmp (cmd, "extendedMapInfos"))
524 {
525 /* Added by tchize
526 * prepare to use the mapextended command
527 */
528 char tmpbuf[20];
529
530 ns->ext_mapinfos = (atoi (param));
531 sprintf (tmpbuf, "%d", ns->ext_mapinfos);
532 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
533 }
534 else if (!strcmp (cmd, "extendedTextInfos"))
535 {
536 /* Added by tchize
537 * prepare to use the extended text commands
538 * Client toggle this to non zero to get exttext
539 */
540 char tmpbuf[20];
541
542 ns->has_readable_type = (atoi (param));
543 sprintf (tmpbuf, "%d", ns->has_readable_type);
544 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
545 }
546 else
547 {
548 /* Didn't get a setup command we understood -
549 * report a failure to the client.
550 */
551 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
552 }
553 } /* for processing all the setup commands */
554
555 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
556 ns->send_packet (cmdback);
557} 355}
558 356
559/** 357/**
560 * The client has requested to be added to the game. 358 * The client has requested to be added to the game.
561 * 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.
562 * 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,
563 * 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.
564 */ 362 */
565void 363void
566AddMeCmd (char *buf, int len, client * ns) 364AddMeCmd (char *buf, int len, client *ns)
567{ 365{
568 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 366 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
569} 367}
570 368
571/** Reply to ExtendedInfos command */ 369/** Reply to ExtendedInfos command */
… …
683 481
684 ns->send_packet (cmdback); 482 ns->send_packet (cmdback);
685} 483}
686 484
687/** 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/**
688 * Tells client the picture it has to use 496 * Tells client the picture it has to use
689 * to smooth a picture number given as argument. 497 * to smooth a picture number given as argument.
690 */ 498 */
691void 499void
692AskSmooth (char *buf, int len, client *ns) 500AskSmooth (char *buf, int len, client *ns)
693{ 501{
694 ns->send_face (atoi (buf)); 502 ns->send_face (atoi (buf));
503 ns->flush_fx ();
695} 504}
696 505
697/** 506/**
698 * 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,
699 * etc.) 508 * etc.)
… …
802 { 611 {
803 case ST_PLAYING: 612 case ST_PLAYING:
804 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 613 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
805 break; 614 break;
806 615
807 case ST_CHANGE_CLASS:
808 key_change_class (pl->ob, buf[0]);
809 break;
810
811 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 616 case ST_GET_PARTY_PASSWORD: /* Get password for party */
812 receive_party_password (pl->ob, 13); 617 receive_party_password (pl->ob, 13);
813 break; 618 break;
814 619
815 default: 620 default:
… …
924/** 729/**
925 * 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
926 * 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)
927 */ 732 */
928void 733void
929send_query (client *ns, uint8 flags, char *text) 734send_query (client *ns, uint8 flags, const char *text)
930{ 735{
931 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 736 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
932} 737}
933 738
934#define AddIfInt64(Old,New,Type) if (Old != New) {\ 739#define AddIfInt64(Old,New,Type) if (Old != New) {\
… …
1250 << uint8 (extendedinfos) 1055 << uint8 (extendedinfos)
1251 << uint8 (eentrysize); 1056 << uint8 (eentrysize);
1252 1057
1253 estartlen = esl.length (); 1058 estartlen = esl.length ();
1254 } 1059 }
1255 else
1256 {
1257 /* suppress compiler warnings */
1258 ewhatstart = 0;
1259 ewhatflag = 0;
1260 estartlen = 0;
1261 }
1262 1060
1263 /* 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
1264 * locations. 1062 * locations.
1265 */ 1063 */
1266 ay = 0; 1064 ay = 0;
… …
1269 * but that started to get a bit messy to look at. 1067 * but that started to get a bit messy to look at.
1270 */ 1068 */
1271 max_x = pl->x + (socket.mapx + 1) / 2; 1069 max_x = pl->x + (socket.mapx + 1) / 2;
1272 max_y = pl->y + (socket.mapy + 1) / 2; 1070 max_y = pl->y + (socket.mapy + 1) / 2;
1273 1071
1072 maptile *plmap = pl->map;
1073
1274 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1074 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1275 { 1075 {
1276 ax = 0; 1076 ax = 0;
1277 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1077 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1278 { 1078 {
… …
1284 /* If the coordinates are not valid, or it is too dark to see, 1084 /* If the coordinates are not valid, or it is too dark to see,
1285 * we tell the client as such 1085 * we tell the client as such
1286 */ 1086 */
1287 nx = x; 1087 nx = x;
1288 ny = y; 1088 ny = y;
1289 m = get_map_from_coord (pl->map, &nx, &ny); 1089 m = get_map_from_coord (plmap, &nx, &ny);
1290 1090
1291 if (!m) 1091 if (!m)
1292 { 1092 {
1293 /* space is out of map. Update space and clear values 1093 /* space is out of map. Update space and clear values
1294 * if this hasn't already been done. If the space is out 1094 * if this hasn't already been done. If the space is out
… …
1379 1179
1380 mapspace &ms = m->at (nx, ny); 1180 mapspace &ms = m->at (nx, ny);
1381 1181
1382 if (socket.extmap) 1182 if (socket.extmap)
1383 { 1183 {
1384 uint8 stat_hp = 0; 1184 uint8 stat_hp = 0;
1385 uint8 stat_width = 0; 1185 uint8 stat_width = 0;
1386 uint8 flags = 0; 1186 uint8 flags = 0;
1387 UUID player = 0; 1187 tag_t player = 0;
1388 1188
1389 // send hp information, if applicable 1189 // send hp information, if applicable
1390 if (object *op = ms.faces_obj [0]) 1190 if (object *op = ms.faces_obj [0])
1391 { 1191 {
1392 if (op->head || op->invisible) 1192 if (op->head || op->invisible)
… …
1433 1233
1434 mask |= 0x8; 1234 mask |= 0x8;
1435 *last_ext |= 0x80; 1235 *last_ext |= 0x80;
1436 last_ext = &sl[sl.length ()]; 1236 last_ext = &sl[sl.length ()];
1437 1237
1438 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1238 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1439 } 1239 }
1440 1240
1441 if (lastcell.flags != flags) 1241 if (lastcell.flags != flags)
1442 { 1242 {
1443 lastcell.flags = flags; 1243 lastcell.flags = flags;
… …
1516 esl.reset (eoldlen); 1316 esl.reset (eoldlen);
1517 } 1317 }
1518 } /* else this is a viewable space */ 1318 } /* else this is a viewable space */
1519 } /* for x loop */ 1319 } /* for x loop */
1520 } /* for y loop */ 1320 } /* for y loop */
1321
1322 socket.flush_fx ();
1521 1323
1522 /* Verify that we in fact do need to send this */ 1324 /* Verify that we in fact do need to send this */
1523 if (socket.ext_mapinfos) 1325 if (socket.ext_mapinfos)
1524 { 1326 {
1525 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