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.83 by root, Mon Apr 2 18:04:47 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.force_newmap)
152 { 154 {
155 // force newmap is used for clients that do not redraw their map
156 // after image uploads.
153 socket.current_map = ob->map; 157 socket.current_map = ob->map;
154
155 clear_map (pl); 158 clear_map (pl);
159 }
160 else if (socket.current_map != ob->map)
161 {
162 clear_map (pl);
163 socket.current_map = ob->map;
156 164
157 if (socket.mapinfocmd) 165 if (socket.mapinfocmd)
158 { 166 {
159 if (ob->map && ob->map->path[0]) 167 if (ob->map && ob->map->path[0])
160 { 168 {
… …
344 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 352 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
345 353
346 pl->ns->send_packet (bigbuf); 354 pl->ns->send_packet (bigbuf);
347} 355}
348 356
349/** This is the Setup cmd - easy first implementation */ 357/** This is the Setup cmd */
350void 358void
351SetUp (char *buf, int len, client * ns) 359SetUp (char *buf, int len, client * ns)
352{ 360{
353 int s, slen; 361 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} 362}
558 363
559/** 364/**
560 * The client has requested to be added to the game. 365 * 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. 366 * 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, 367 * 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. 368 * it either has to be here or init_sockets needs to be exported.
564 */ 369 */
565void 370void
566AddMeCmd (char *buf, int len, client * ns) 371AddMeCmd (char *buf, int len, client *ns)
567{ 372{
568 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 373 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
569} 374}
570 375
571/** Reply to ExtendedInfos command */ 376/** Reply to ExtendedInfos command */
… …
680 snprintf (temp, sizeof (temp), "%d", i); 485 snprintf (temp, sizeof (temp), "%d", i);
681 strcat (cmdback, temp); 486 strcat (cmdback, temp);
682 } 487 }
683 488
684 ns->send_packet (cmdback); 489 ns->send_packet (cmdback);
490}
491
492/**
493 * client requested an image. send it rate-limited
494 * before flushing.
495 */
496void
497AskFaceCmd (char *buf, int len, client *ns)
498{
499 ns->askface.push_back (atoi (buf));
685} 500}
686 501
687/** 502/**
688 * Tells client the picture it has to use 503 * Tells client the picture it has to use
689 * to smooth a picture number given as argument. 504 * to smooth a picture number given as argument.
… …
924/** 739/**
925 * Asks the client to query the user. This way, the client knows 740 * 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) 741 * it needs to send something back (vs just printing out a message)
927 */ 742 */
928void 743void
929send_query (client *ns, uint8 flags, char *text) 744send_query (client *ns, uint8 flags, const char *text)
930{ 745{
931 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 746 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
932} 747}
933 748
934#define AddIfInt64(Old,New,Type) if (Old != New) {\ 749#define AddIfInt64(Old,New,Type) if (Old != New) {\
… …
1250 << uint8 (extendedinfos) 1065 << uint8 (extendedinfos)
1251 << uint8 (eentrysize); 1066 << uint8 (eentrysize);
1252 1067
1253 estartlen = esl.length (); 1068 estartlen = esl.length ();
1254 } 1069 }
1255 else
1256 {
1257 /* suppress compiler warnings */
1258 ewhatstart = 0;
1259 ewhatflag = 0;
1260 estartlen = 0;
1261 }
1262 1070
1263 /* x,y are the real map locations. ax, ay are viewport relative 1071 /* x,y are the real map locations. ax, ay are viewport relative
1264 * locations. 1072 * locations.
1265 */ 1073 */
1266 ay = 0; 1074 ay = 0;
… …
1269 * but that started to get a bit messy to look at. 1077 * but that started to get a bit messy to look at.
1270 */ 1078 */
1271 max_x = pl->x + (socket.mapx + 1) / 2; 1079 max_x = pl->x + (socket.mapx + 1) / 2;
1272 max_y = pl->y + (socket.mapy + 1) / 2; 1080 max_y = pl->y + (socket.mapy + 1) / 2;
1273 1081
1082 maptile *plmap = pl->map;
1083
1274 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1084 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1275 { 1085 {
1276 ax = 0; 1086 ax = 0;
1277 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1087 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1278 { 1088 {
… …
1284 /* If the coordinates are not valid, or it is too dark to see, 1094 /* If the coordinates are not valid, or it is too dark to see,
1285 * we tell the client as such 1095 * we tell the client as such
1286 */ 1096 */
1287 nx = x; 1097 nx = x;
1288 ny = y; 1098 ny = y;
1289 m = get_map_from_coord (pl->map, &nx, &ny); 1099 m = get_map_from_coord (plmap, &nx, &ny);
1290 1100
1291 if (!m) 1101 if (!m)
1292 { 1102 {
1293 /* space is out of map. Update space and clear values 1103 /* space is out of map. Update space and clear values
1294 * if this hasn't already been done. If the space is out 1104 * if this hasn't already been done. If the space is out

Diff Legend

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