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.24 by root, Tue Sep 19 22:05:55 2006 UTC vs.
Revision 1.34 by root, Thu Dec 14 01:59:10 2006 UTC

… …
41 * if a face has not already been sent to the client, it is sent now. 41 * if a face has not already been sent to the client, it is sent now.
42 * 42 *
43 * mapcellchanged, compactlayer, compactstack, perform the map compressing 43 * mapcellchanged, compactlayer, compactstack, perform the map compressing
44 * operations 44 * operations
45 * 45 *
46 * esrv_map_doneredraw finishes the map update, and ships across the
47 * map updates.
48 *
49 */ 46 */
50 47
51#include <global.h> 48#include <global.h>
52#include <sproto.h> 49#include <sproto.h>
53 50
… …
57#include <commands.h> 54#include <commands.h>
58 55
59/* This block is basically taken from socket.c - I assume if it works there, 56/* This block is basically taken from socket.c - I assume if it works there,
60 * it should work here. 57 * it should work here.
61 */ 58 */
62#ifndef WIN32 /* ---win32 exclude unix headers */
63# include <sys/types.h> 59#include <sys/types.h>
64# include <sys/time.h> 60#include <sys/time.h>
65# include <sys/socket.h> 61#include <sys/socket.h>
66# include <netinet/in.h> 62#include <netinet/in.h>
67# include <netdb.h> 63#include <netdb.h>
68#endif /* win32 */
69 64
70#ifdef HAVE_UNISTD_H 65#ifdef HAVE_UNISTD_H
71# include <unistd.h> 66# include <unistd.h>
72#endif 67#endif
73 68
… …
104{ 99{
105 struct Map newmap; 100 struct Map newmap;
106 int x, y, mx, my; 101 int x, y, mx, my;
107 102
108 { 103 {
109 char buf[MAXSOCKBUF]; 104 packet sl;
110 105
111 sprintf (buf, "map_scroll %d %d", dx, dy); 106 sl.printf ("map_scroll %d %d", dx, dy);
112 Write_String_To_Socket (ns, buf, strlen (buf)); 107 ns->send_packet (sl);
113 } 108 }
114 109
115 /* If we are using the Map1aCmd, we may in fact send 110 /* If we are using the Map1aCmd, we may in fact send
116 * head information that is outside the viewable map. 111 * head information that is outside the viewable map.
117 * So set the mx,my to the max value we want to 112 * So set the mx,my to the max value we want to
… …
137 for (x = 0; x < mx; x++) 132 for (x = 0; x < mx; x++)
138 { 133 {
139 for (y = 0; y < my; y++) 134 for (y = 0; y < my; y++)
140 { 135 {
141 if (x >= ns->mapx || y >= ns->mapy) 136 if (x >= ns->mapx || y >= ns->mapy)
142 {
143 /* clear cells outside the viewable area */ 137 /* clear cells outside the viewable area */
144 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 138 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
145 }
146 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy) 139 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
147 {
148 /* clear newly visible tiles within the viewable area */ 140 /* clear newly visible tiles within the viewable area */
149 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 141 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
150 }
151 else 142 else
152 {
153 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 143 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
154 }
155 } 144 }
156 } 145 }
157 146
158 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 147 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
159 148
… …
169 NewSocket & socket = pl->socket; 158 NewSocket & socket = pl->socket;
170 159
171 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 160 memset (&socket.lastmap, 0, sizeof (socket.lastmap));
172 161
173 if (socket.newmapcmd == 1) 162 if (socket.newmapcmd == 1)
174 Write_String_To_Socket (&socket, "newmap", 6); 163 socket.send_packet ("newmap");
175 164
176 socket.update_look = 1; 165 socket.update_look = 1;
177 socket.look_position = 0; 166 socket.look_position = 0;
178} 167}
179 168
… …
210 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); 199 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path);
211 } 200 }
212 else 201 else
213 snprintf (buf, MAX_BUF, "mapinfo current"); 202 snprintf (buf, MAX_BUF, "mapinfo current");
214 203
215 Write_String_To_Socket (&socket, buf, strlen (buf)); 204 socket.send_packet (buf);
216 } 205 }
217 } 206 }
218 else if (socket.current_x != ob->x || socket.current_y != ob->y) 207 else if (socket.current_x != ob->x || socket.current_y != ob->y)
219 { 208 {
220 int dx = ob->x - socket.current_x; 209 int dx = ob->x - socket.current_x;
… …
322 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 311 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
323 } 312 }
324 else 313 else
325 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 314 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
326 315
327 Write_String_To_Socket (&pl->socket, bigbuf, strlen (bigbuf)); 316 pl->socket.send_packet (bigbuf);
328} 317}
329 318
330/** This is the Setup cmd - easy first implementation */ 319/** This is the Setup cmd - easy first implementation */
331void 320void
332SetUp (char *buf, int len, NewSocket * ns) 321SetUp (char *buf, int len, NewSocket * ns)
… …
339 * 328 *
340 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown 329 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
341 * The client then must sort this out 330 * The client then must sort this out
342 */ 331 */
343 332
344 LOG (llevInfo, "Get SetupCmd:: %s\n", buf); 333 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
334
345 strcpy (cmdback, "setup"); 335 strcpy (cmdback, "setup");
346 for (s = 0; s < len;) 336 for (s = 0; s < len; )
347 { 337 {
348
349 cmd = &buf[s]; 338 cmd = &buf[s];
350 339
351 /* find the next space, and put a null there */ 340 /* find the next space, and put a null there */
352 for (; buf[s] && buf[s] != ' '; s++); 341 for (; buf[s] && buf[s] != ' '; s++)
342 ;
343
353 buf[s++] = 0; 344 buf[s++] = 0;
345
354 while (buf[s] == ' ') 346 while (buf[s] == ' ')
355 s++; 347 s++;
356 348
357 if (s >= len) 349 if (s >= len)
358 break; 350 break;
359 351
360 param = &buf[s]; 352 param = &buf[s];
361 353
362 for (; buf[s] && buf[s] != ' '; s++); 354 for (; buf[s] && buf[s] != ' '; s++)
355 ;
356
363 buf[s++] = 0; 357 buf[s++] = 0;
358
364 while (buf[s] == ' ') 359 while (buf[s] == ' ')
365 s++; 360 s++;
366 361
367 slen = strlen (cmdback); 362 slen = strlen (cmdback);
368 safe_strcat (cmdback, " ", &slen, HUGE_BUF); 363 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
… …
529 * report a failure to the client. 524 * report a failure to the client.
530 */ 525 */
531 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF); 526 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
532 } 527 }
533 } /* for processing all the setup commands */ 528 } /* for processing all the setup commands */
529
534 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); 530 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
535 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 531 ns->send_packet (cmdback);
536} 532}
537 533
538/** 534/**
539 * The client has requested to be added to the game. 535 * The client has requested to be added to the game.
540 * This is what takes care of it. We tell the client how things worked out. 536 * This is what takes care of it. We tell the client how things worked out.
… …
546{ 542{
547 Settings oldsettings; 543 Settings oldsettings;
548 544
549 oldsettings = settings; 545 oldsettings = settings;
550 if (ns->status != Ns_Add || add_player (ns)) 546 if (ns->status != Ns_Add || add_player (ns))
551 { 547 ns->send_packet ("addme_failed");
552 Write_String_To_Socket (ns, "addme_failed", 12);
553 }
554 else 548 else
555 { 549 {
556 /* Basically, the add_player copies the socket structure into 550 /* Basically, the add_player copies the socket structure into
557 * the player structure, so this one (which is from init_sockets) 551 * the player structure, so this one (which is from init_sockets)
558 * is not needed anymore. The write below should still work, as the 552 * is not needed anymore. The write below should still work, as the
559 * stuff in ns is still relevant. 553 * stuff in ns is still relevant.
560 */ 554 */
561 Write_String_To_Socket (ns, "addme_success", 13); 555 ns->send_packet ("addme_success");
562 socket_info.nconns--; 556 socket_info.nconns--;
563 ns->status = Ns_Avail; 557 ns->status = Ns_Avail;
564 } 558 }
559
565 settings = oldsettings; 560 settings = oldsettings;
566} 561}
567 562
568/** Reply to ExtendedInfos command */ 563/** Reply to ExtendedInfos command */
569void 564void
… …
613 { 608 {
614 strcat (cmdback, " "); 609 strcat (cmdback, " ");
615 strcat (cmdback, "smoothing"); 610 strcat (cmdback, "smoothing");
616 } 611 }
617 612
618 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 613 ns->send_packet (cmdback);
619} 614}
620 615
621/* 616/*
622#define MSG_TYPE_BOOK 1 617#define MSG_TYPE_BOOK 1
623#define MSG_TYPE_CARD 2 618#define MSG_TYPE_CARD 2
… …
676 strcat (cmdback, " "); 671 strcat (cmdback, " ");
677 snprintf (temp, sizeof (temp), "%d", i); 672 snprintf (temp, sizeof (temp), "%d", i);
678 strcat (cmdback, temp); 673 strcat (cmdback, temp);
679 } 674 }
680 675
681 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 676 ns->send_packet (cmdback);
682} 677}
683 678
684/** 679/**
685 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 680 * A lot like the old AskSmooth (in fact, now called by AskSmooth).
686 * Basically, it makes no sense to wait for the client to request a 681 * Basically, it makes no sense to wait for the client to request a
… …
690 */ 685 */
691static void 686static void
692SendSmooth (NewSocket * ns, uint16 face) 687SendSmooth (NewSocket * ns, uint16 face)
693{ 688{
694 uint16 smoothface; 689 uint16 smoothface;
695 unsigned char reply[MAX_BUF];
696 SockList sl;
697 690
698 /* If we can't find a face, return and set it so we won't try to send this 691 /* If we can't find a face, return and set it so we won't try to send this
699 * again. 692 * again.
700 */ 693 */
701 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 694 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
… …
709 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 702 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
710 esrv_send_face (ns, smoothface, 0); 703 esrv_send_face (ns, smoothface, 0);
711 704
712 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 705 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
713 706
714 sl.buf = reply; 707 packet sl;
715 strcpy ((char *) sl.buf, "smooth "); 708
716 sl.len = strlen ((char *) sl.buf); 709 sl << "smooth "
717 SockList_AddShort (&sl, face); 710 << uint16 (face)
718 SockList_AddShort (&sl, smoothface); 711 << uint16 (smoothface);
712
719 Send_With_Handling (ns, &sl); 713 Send_With_Handling (ns, &sl);
720} 714}
721 715
722 /** 716 /**
723 * Tells client the picture it has to use 717 * Tells client the picture it has to use
… …
729 uint16 facenbr; 723 uint16 facenbr;
730 724
731 facenbr = atoi (buf); 725 facenbr = atoi (buf);
732 SendSmooth (ns, facenbr); 726 SendSmooth (ns, facenbr);
733} 727}
734
735
736
737
738 728
739/** 729/**
740 * This handles the general commands from the client (ie, north, fire, cast, 730 * This handles the general commands from the client (ie, north, fire, cast,
741 * etc.) 731 * etc.)
742 */ 732 */
… …
796 */ 786 */
797void 787void
798NewPlayerCmd (uint8 * buf, int len, player *pl) 788NewPlayerCmd (uint8 * buf, int len, player *pl)
799{ 789{
800 int time, repeat; 790 int time, repeat;
801 short packet;
802 unsigned char command[MAX_BUF]; 791 char command[MAX_BUF];
803 SockList sl; 792 int pktlen;
804 793
805 if (len < 7) 794 if (len < 7)
806 { 795 {
807 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 796 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
808 return; 797 return;
809 } 798 }
810 799
811 packet = GetShort_String (buf); 800 pktlen = net_uint16 (buf);
812 repeat = GetInt_String (buf + 2); 801 repeat = net_uint32 (buf + 2);
802
813 /* -1 is special - no repeat, but don't update */ 803 /* -1 is special - no repeat, but don't update */
814 if (repeat != -1) 804 if (repeat != -1)
815 {
816 pl->count = repeat; 805 pl->count = repeat;
817 } 806
818 if ((len - 4) >= MAX_BUF) 807 if ((len - 4) >= MAX_BUF)
819 len = MAX_BUF - 5; 808 len = MAX_BUF - 5;
820 809
821 strncpy ((char *) command, (char *) buf + 6, len - 4); 810 strncpy ((char *) command, (char *) buf + 6, len - 4);
822 command[len - 4] = '\0'; 811 command[len - 4] = '\0';
… …
832 return; 821 return;
833 } 822 }
834 823
835 /* This should not happen anymore. */ 824 /* This should not happen anymore. */
836 if (pl->ob->speed_left < -1.0) 825 if (pl->ob->speed_left < -1.0)
837 {
838 LOG (llevError, "Player has negative time - shouldn't do command.\n"); 826 LOG (llevError, "Player has negative time - shouldn't do command.\n");
839 } 827
840 /* In c_new.c */ 828 /* In c_new.c */
841 execute_newserver_command (pl->ob, (char *) command); 829 execute_newserver_command (pl->ob, (char *) command);
842 /* Perhaps something better should be done with a left over count. 830 /* Perhaps something better should be done with a left over count.
843 * Cleaning up the input should probably be done first - all actions 831 * Cleaning up the input should probably be done first - all actions
844 * for the command that issued the count should be done before any other 832 * for the command that issued the count should be done before any other
845 * commands. 833 * commands.
846 */ 834 */
847 pl->count = 0; 835 pl->count = 0;
848 836
849 /* Send confirmation of command execution now */
850 sl.buf = command;
851 strcpy ((char *) sl.buf, "comc ");
852 sl.len = 5;
853 SockList_AddShort (&sl, packet);
854 if (FABS (pl->ob->speed) < 0.001) 837 if (FABS (pl->ob->speed) < 0.001)
855 time = MAX_TIME * 100; 838 time = MAX_TIME * 100;
856 else 839 else
857 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 840 time = (int) (MAX_TIME / FABS (pl->ob->speed));
858 SockList_AddInt (&sl, time); 841
842 /* Send confirmation of command execution now */
843
844 packet sl;
845 sl << "comc " << uint16 (pktlen) << uint32 (time);
859 Send_With_Handling (&pl->socket, &sl); 846 Send_With_Handling (&pl->socket, &sl);
860} 847}
861 848
862 849
863/** This is a reply to a previous query. */ 850/** This is a reply to a previous query. */
… …
976 /* these are old dxclients */ 963 /* these are old dxclients */
977 /* Version 1024 added support for singular + plural name values - 964 /* Version 1024 added support for singular + plural name values -
978 * requiing this minimal value reduces complexity of that code, and it 965 * requiing this minimal value reduces complexity of that code, and it
979 * has been around for a long time. 966 * has been around for a long time.
980 */ 967 */
981 if (!strcmp (" CF DX CLIENT", cp) || ns->sc_version < 1024) 968 if (ns->sc_version < 1026)
982 { 969 {
983 sprintf (version_warning, "drawinfo %d %s", NDI_RED, 970 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
984 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 971 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
985 Write_String_To_Socket (ns, version_warning, strlen (version_warning)); 972 ns->send_packet (version_warning);
986 } 973 }
987 974
988 } 975 }
989} 976}
990 977
… …
1062send_query (NewSocket * ns, uint8 flags, char *text) 1049send_query (NewSocket * ns, uint8 flags, char *text)
1063{ 1050{
1064 char buf[MAX_BUF]; 1051 char buf[MAX_BUF];
1065 1052
1066 sprintf (buf, "query %d %s", flags, text ? text : ""); 1053 sprintf (buf, "query %d %s", flags, text ? text : "");
1067 Write_String_To_Socket (ns, buf, strlen (buf)); 1054 ns->send_packet (buf);
1068} 1055}
1069 1056
1070#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1057#define AddIfInt64(Old,New,Type) if (Old != New) {\
1071 Old = New; \ 1058 Old = New; \
1072 SockList_AddChar(&sl, Type); \ 1059 sl << uint8 (Type) << uint64 (New); \
1073 SockList_AddInt64(&sl, New); \
1074 } 1060 }
1075 1061
1076#define AddIfInt(Old,New,Type) if (Old != New) {\ 1062#define AddIfInt(Old,New,Type) if (Old != New) {\
1077 Old = New; \ 1063 Old = New; \
1078 SockList_AddChar(&sl, Type); \ 1064 sl << uint8 (Type) << uint32 (New); \
1079 SockList_AddInt(&sl, New); \
1080 } 1065 }
1081 1066
1082#define AddIfShort(Old,New,Type) if (Old != New) {\ 1067#define AddIfShort(Old,New,Type) if (Old != New) {\
1083 Old = New; \ 1068 Old = New; \
1084 SockList_AddChar(&sl, Type); \ 1069 sl << uint8 (Type) << uint16 (New); \
1085 SockList_AddShort(&sl, New); \
1086 } 1070 }
1087 1071
1088#define AddIfFloat(Old,New,Type) if (Old != New) {\ 1072#define AddIfFloat(Old,New,Type) if (Old != New) {\
1089 Old = New; \ 1073 Old = New; \
1090 SockList_AddChar(&sl, Type); \ 1074 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \
1091 SockList_AddInt(&sl,(long)(New*FLOAT_MULTI));\
1092 } 1075 }
1093 1076
1094#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 1077#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1095 if (Old) free(Old);\
1096 Old = strdup_local(New);\ 1078 free(Old); Old = strdup (New);\
1097 SockList_AddChar(&sl, Type); \ 1079 sl << uint8 (Type) << data8 (New); \
1098 SockList_AddChar(&sl, ( char )strlen(New)); \
1099 strcpy((char*)sl.buf + sl.len, New); \
1100 sl.len += strlen(New); \
1101 } 1080 }
1102 1081
1103/** 1082/**
1104 * Sends a statistics update. We look at the old values, 1083 * Sends a statistics update. We look at the old values,
1105 * and only send what has changed. Stat mapping values are in newclient.h 1084 * and only send what has changed. Stat mapping values are in newclient.h
… …
1107 * commands for now. 1086 * commands for now.
1108 */ 1087 */
1109void 1088void
1110esrv_update_stats (player *pl) 1089esrv_update_stats (player *pl)
1111{ 1090{
1112 SockList sl;
1113 char buf[MAX_BUF]; 1091 char buf[MAX_BUF];
1114 uint16 flags; 1092 uint16 flags;
1115 1093
1116 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1094 packet sl;
1117 strcpy ((char *) sl.buf, "stats "); 1095 sl << "stats ";
1118 sl.len = strlen ((char *) sl.buf);
1119 1096
1120 if (pl->ob != NULL) 1097 if (pl->ob != NULL)
1121 { 1098 {
1122 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1099 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
1123 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1100 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
… …
1140 1117
1141 for (s = 0; s < NUM_SKILLS; s++) 1118 for (s = 0; s < NUM_SKILLS; s++)
1142 { 1119 {
1143 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1120 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1144 { 1121 {
1145
1146 /* Always send along the level if exp changes. This is only 1122 /* Always send along the level if exp changes. This is only
1147 * 1 extra byte, but keeps processing simpler. 1123 * 1 extra byte, but keeps processing simpler.
1148 */ 1124 */
1149 SockList_AddChar (&sl, (char) (s + CS_STAT_SKILLINFO)); 1125 sl << uint8 (s + CS_STAT_SKILLINFO)
1150 SockList_AddChar (&sl, (char) pl->last_skill_ob[s]->level); 1126 << uint8 (pl->last_skill_ob[s]->level)
1151 SockList_AddInt64 (&sl, pl->last_skill_ob[s]->stats.exp); 1127 << uint64 (pl->last_skill_ob[s]->stats.exp);
1128
1152 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1129 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1153 } 1130 }
1154 } 1131 }
1155 } 1132 }
1156 1133
… …
1204 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); 1181 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE);
1205 set_title (pl->ob, buf); 1182 set_title (pl->ob, buf);
1206 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1183 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE);
1207 1184
1208 /* Only send it away if we have some actual data */ 1185 /* Only send it away if we have some actual data */
1209 if (sl.len > 6) 1186 if (sl.length () > 6)
1210 {
1211#ifdef ESRV_DEBUG
1212 LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len);
1213#endif
1214 Send_With_Handling (&pl->socket, &sl); 1187 Send_With_Handling (&pl->socket, &sl);
1215 }
1216
1217 free (sl.buf);
1218} 1188}
1219 1189
1220/** 1190/**
1221 * Tells the client that here is a player it should start using. 1191 * Tells the client that here is a player it should start using.
1222 */ 1192 */
1223void 1193void
1224esrv_new_player (player *pl, uint32 weight) 1194esrv_new_player (player *pl, uint32 weight)
1225{ 1195{
1226 SockList sl;
1227
1228 pl->last_weight = weight; 1196 pl->last_weight = weight;
1229 1197
1230 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1198 packet sl;
1199 sl << "player ";
1231 1200
1232 strcpy ((char *) sl.buf, "player "); 1201 sl << uint32 (pl->ob->count)
1233 sl.len = strlen ((char *) sl.buf); 1202 << uint32 (weight)
1234 SockList_AddInt (&sl, pl->ob->count); 1203 << uint32 (pl->ob->face->number)
1235 SockList_AddInt (&sl, weight); 1204 << data8 (pl->ob->name);
1236 SockList_AddInt (&sl, pl->ob->face->number);
1237
1238 SockList_AddChar (&sl, (char) strlen (pl->ob->name));
1239 strcpy ((char *) sl.buf + sl.len, pl->ob->name);
1240 sl.len += strlen (pl->ob->name);
1241 1205
1242 Send_With_Handling (&pl->socket, &sl); 1206 Send_With_Handling (&pl->socket, &sl);
1243 free (sl.buf);
1244 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1207 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1245} 1208}
1246 1209
1247/** 1210/**
1248 * Need to send an animation sequence to the client. 1211 * Need to send an animation sequence to the client.
… …
1252 * when the player logs in and picks stuff up. 1215 * when the player logs in and picks stuff up.
1253 */ 1216 */
1254void 1217void
1255esrv_send_animation (NewSocket * ns, short anim_num) 1218esrv_send_animation (NewSocket * ns, short anim_num)
1256{ 1219{
1257 SockList sl;
1258 int i; 1220 int i;
1259 1221
1260 /* Do some checking on the anim_num we got. Note that the animations 1222 /* Do some checking on the anim_num we got. Note that the animations
1261 * are added in contigous order, so if the number is in the valid 1223 * are added in contigous order, so if the number is in the valid
1262 * range, it must be a valid animation. 1224 * range, it must be a valid animation.
… …
1265 { 1227 {
1266 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1228 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1267 return; 1229 return;
1268 } 1230 }
1269 1231
1270 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1232 packet sl;
1271 strcpy ((char *) sl.buf, "anim "); 1233
1272 sl.len = 5; 1234 sl << "anim "
1273 SockList_AddShort (&sl, anim_num); 1235 << uint16 (anim_num)
1274 SockList_AddShort (&sl, 0); /* flags - not used right now */ 1236 << uint16 (0); /* flags - not used right now */
1237
1275 /* Build up the list of faces. Also, send any information (ie, the 1238 /* Build up the list of faces. Also, send any information (ie, the
1276 * the face itself) down to the client. 1239 * the face itself) down to the client.
1277 */ 1240 */
1278 for (i = 0; i < animations[anim_num].num_animations; i++) 1241 for (i = 0; i < animations[anim_num].num_animations; i++)
1279 { 1242 {
1280 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1243 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1281 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1244 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1282 SockList_AddShort (&sl, animations[anim_num].faces[i]); /* flags - not used right now */ 1245 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1283 } 1246 }
1247
1284 Send_With_Handling (ns, &sl); 1248 Send_With_Handling (ns, &sl);
1285 free (sl.buf); 1249
1286 ns->anims_sent[anim_num] = 1; 1250 ns->anims_sent[anim_num] = 1;
1287} 1251}
1288 1252
1289 1253
1290/****************************************************************************** 1254/******************************************************************************
… …
1304 { 1268 {
1305 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1269 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1306 return; 1270 return;
1307 abort (); 1271 abort ();
1308 } 1272 }
1273
1309 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1274 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1310 newmap->cells[x][y].count++; 1275 newmap->cells[x][y].count++;
1276
1311 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1277 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1312 esrv_send_face (ns, face_num, 0); 1278 esrv_send_face (ns, face_num, 0);
1313} 1279}
1314 1280
1315struct LayerCell 1281struct LayerCell
… …
1417 *fcur = *fcur | 128; /* mark for end of faces at this layer */ 1383 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1418 } 1384 }
1419 return cur; 1385 return cur;
1420} 1386}
1421 1387
1422static void
1423esrv_map_doneredraw (NewSocket * ns, struct Map *newmap)
1424{
1425 static long frames, bytes, tbytes, tframes;
1426 char *cur;
1427 SockList sl;
1428
1429
1430 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
1431 strcpy ((char *) sl.buf, "map ");
1432 sl.len = strlen ((char *) sl.buf);
1433
1434 cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap);
1435 sl.len = cur - (char *) sl.buf;
1436
1437/* LOG(llevDebug, "Sending map command.\n");*/
1438
1439 if (sl.len > (int) strlen ("map ") || ns->sent_scroll)
1440 {
1441 /* All of this is just accounting stuff */
1442 if (tframes > 100)
1443 tframes = tbytes = 0;
1444
1445 tframes++;
1446 frames++;
1447 tbytes += sl.len;
1448 bytes += sl.len;
1449 memcpy (&ns->lastmap, newmap, sizeof (struct Map));
1450 Send_With_Handling (ns, &sl);
1451 ns->sent_scroll = 0;
1452 }
1453
1454 free (sl.buf);
1455}
1456
1457
1458/** Clears a map cell */ 1388/** Clears a map cell */
1459static void 1389static void
1460map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1390map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1461{ 1391{
1462 cell->faces[0] = face0; 1392 cell->faces[0] = face0;
1463 cell->faces[1] = face1; 1393 cell->faces[1] = face1;
1464 cell->faces[2] = face2; 1394 cell->faces[2] = face2;
1465 cell->count = count; 1395 cell->count = count;
1466 cell->stat_hp = 0; 1396 cell->stat_hp = 0;
1397 cell->flags = 0;
1467 cell->player = 0; 1398 cell->player = 0;
1468} 1399}
1469 1400
1470#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) 1401#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1471#define MAX_LAYERS 3 1402#define MAX_LAYERS 3
1472 1403
… …
1500 * needs to get sent - if so, it adds the data, sending the head 1431 * needs to get sent - if so, it adds the data, sending the head
1501 * if needed, and returning 1. If this no data needs to get 1432 * if needed, and returning 1. If this no data needs to get
1502 * sent, it returns zero. 1433 * sent, it returns zero.
1503 */ 1434 */
1504static int 1435static int
1505check_head (SockList & sl, NewSocket & ns, int ax, int ay, int layer) 1436check_head (packet &sl, NewSocket &ns, int ax, int ay, int layer)
1506{ 1437{
1507 short face_num; 1438 short face_num;
1508 1439
1509 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1440 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1510 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1441 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1511 else 1442 else
1512 face_num = 0; 1443 face_num = 0;
1513 1444
1514 if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) 1445 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1515 { 1446 {
1516 SockList_AddShort (&sl, face_num); 1447 sl << uint16 (face_num);
1517 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1448 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1518 esrv_send_face (&ns, face_num, 0); 1449 esrv_send_face (&ns, face_num, 0);
1450
1519 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; 1451 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1520 ns.lastmap.cells[ax][ay].faces[layer] = face_num; 1452 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1521 return 1; 1453 return 1;
1522 } 1454 }
1523 1455
… …
1543 * the case, it seems to make more sense to have these layer values 1475 * the case, it seems to make more sense to have these layer values
1544 * actually match. 1476 * actually match.
1545 */ 1477 */
1546 1478
1547static int 1479static int
1548update_space (SockList * sl, NewSocket * ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1480update_space (packet &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1549{ 1481{
1550 object *ob, *head; 1482 object *ob, *head;
1551 uint16 face_num; 1483 uint16 face_num;
1552 int bx, by, i; 1484 int bx, by, i;
1553 1485
1554 /* If there is a multipart object stored away, treat that as more important. 1486 /* If there is a multipart object stored away, treat that as more important.
1555 * If not, then do the normal processing. 1487 * If not, then do the normal processing.
1556 */ 1488 */
1557
1558 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; 1489 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1559 1490
1560 /* Check to see if this head is part of the set of objects 1491 /* Check to see if this head is part of the set of objects
1561 * we would normally send for this space. If so, then 1492 * we would normally send for this space. If so, then
1562 * don't use the head value. We need to do the check 1493 * don't use the head value. We need to do the check
… …
1727 1658
1728 /* Another hack - because of heads and whatnot, this face may match one 1659 /* Another hack - because of heads and whatnot, this face may match one
1729 * we already sent for a lower layer. In that case, don't send 1660 * we already sent for a lower layer. In that case, don't send
1730 * this one. 1661 * this one.
1731 */ 1662 */
1732 if (face_num && layer + 1 < MAP_LAYERS && ns->lastmap.cells[sx][sy].faces[layer + 1] == face_num) 1663 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1733 {
1734 face_num = 0; 1664 face_num = 0;
1735 }
1736 1665
1737 /* We've gotten what face we want to use for the object. Now see if 1666 /* We've gotten what face we want to use for the object. Now see if
1738 * if it has changed since we last sent it to the client. 1667 * if it has changed since we last sent it to the client.
1739 */ 1668 */
1740 if (ns->lastmap.cells[sx][sy].faces[layer] != face_num) 1669 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
1741 { 1670 {
1742 ns->lastmap.cells[sx][sy].faces[layer] = face_num; 1671 ns.lastmap.cells[sx][sy].faces[layer] = face_num;
1743 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1672 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1744 esrv_send_face (ns, face_num, 0); 1673 esrv_send_face (&ns, face_num, 0);
1745 SockList_AddShort (sl, face_num); 1674
1675 sl << uint16 (face_num);
1746 return 1; 1676 return 1;
1747 } 1677 }
1678
1748 /* Nothing changed */ 1679 /* Nothing changed */
1749 return 0; 1680 return 0;
1750} 1681}
1751 1682
1752/** 1683/**
… …
1767 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1698 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1768 * take. 1699 * take.
1769 */ 1700 */
1770 1701
1771static inline int 1702static inline int
1772update_smooth (SockList * sl, NewSocket * ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1703update_smooth (packet &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1773{ 1704{
1774 object *ob; 1705 object *ob;
1775 int smoothlevel; /* old face_num; */ 1706 int smoothlevel; /* old face_num; */
1776 1707
1777 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1708 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1782 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1713 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1783 smoothlevel = 0; 1714 smoothlevel = 0;
1784 else 1715 else
1785 { 1716 {
1786 smoothlevel = ob->smoothlevel; 1717 smoothlevel = ob->smoothlevel;
1787 if (smoothlevel && !(ns->faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1718 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1788 SendSmooth (ns, ob->face->number); 1719 SendSmooth (&ns, ob->face->number);
1789 } /* else not already head object or blank face */ 1720 } /* else not already head object or blank face */
1790 1721
1791 /* We've gotten what face we want to use for the object. Now see if 1722 /* We've gotten what face we want to use for the object. Now see if
1792 * if it has changed since we last sent it to the client. 1723 * if it has changed since we last sent it to the client.
1793 */ 1724 */
1794 if (smoothlevel > 255) 1725 if (smoothlevel > 255)
1795 smoothlevel = 255; 1726 smoothlevel = 255;
1796 else if (smoothlevel < 0) 1727 else if (smoothlevel < 0)
1797 smoothlevel = 0; 1728 smoothlevel = 0;
1729
1798 if (ns->lastmap.cells[sx][sy].smooth[layer] != smoothlevel) 1730 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1799 { 1731 {
1800 ns->lastmap.cells[sx][sy].smooth[layer] = smoothlevel; 1732 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1801 SockList_AddChar (sl, (uint8) (smoothlevel & 0xFF)); 1733 sl << uint8 (smoothlevel);
1802 return 1; 1734 return 1;
1803 } 1735 }
1736
1804 /* Nothing changed */ 1737 /* Nothing changed */
1805 return 0; 1738 return 0;
1806} 1739}
1807 1740
1808/** 1741/**
… …
1849draw_client_map1 (object *pl) 1782draw_client_map1 (object *pl)
1850{ 1783{
1851 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1784 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;
1852 sint16 nx, ny; 1785 sint16 nx, ny;
1853 int estartlen, eoldlen; 1786 int estartlen, eoldlen;
1854 SockList sl;
1855 SockList esl; /*For extended Map info */
1856 uint16 mask, emask; 1787 uint16 mask, emask;
1857 uint8 eentrysize; 1788 uint8 eentrysize;
1858 uint16 ewhatstart, ewhatflag; 1789 uint16 ewhatstart, ewhatflag;
1859 uint8 extendedinfos; 1790 uint8 extendedinfos;
1860 maptile *m; 1791 maptile *m;
1861 1792
1862 NewSocket & socket = pl->contr->socket; 1793 NewSocket &socket = pl->contr->socket;
1863 1794
1864 check_map_change (pl->contr); 1795 check_map_change (pl->contr);
1865 1796
1866 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1797 packet sl;
1867 if (socket.mapmode == Map1Cmd) 1798 packet esl;
1868 strcpy ((char *) sl.buf, "map1 "); 1799
1869 else 1800 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1870 strcpy ((char *) sl.buf, "map1a ");
1871 sl.len = strlen ((char *) sl.buf);
1872 startlen = sl.len; 1801 startlen = sl.length ();
1802
1873 /*Extendedmapinfo structure initialisation */ 1803 /*Extendedmapinfo structure initialisation */
1874 if (socket.ext_mapinfos) 1804 if (socket.ext_mapinfos)
1875 { 1805 {
1876 esl.buf = (unsigned char *) malloc (MAXSOCKBUF);
1877 strcpy ((char *) esl.buf, "mapextended ");
1878 esl.len = strlen ((char *) esl.buf);
1879 extendedinfos = EMI_NOREDRAW; 1806 extendedinfos = EMI_NOREDRAW;
1807
1880 if (socket.EMI_smooth) 1808 if (socket.EMI_smooth)
1881 extendedinfos |= EMI_SMOOTH; 1809 extendedinfos |= EMI_SMOOTH;
1810
1882 ewhatstart = esl.len; 1811 ewhatstart = esl.length ();
1883 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1812 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1884 could need to be taken away */ 1813 could need to be taken away */
1885 SockList_AddChar (&esl, extendedinfos);
1886 eentrysize = getExtendedMapInfoSize (&socket); 1814 eentrysize = getExtendedMapInfoSize (&socket);
1887 SockList_AddChar (&esl, eentrysize); 1815 esl << "mapextended "
1816 << uint8 (extendedinfos)
1817 << uint8 (eentrysize);
1818
1888 estartlen = esl.len; 1819 estartlen = esl.length ();
1889 } 1820 }
1890 else 1821 else
1891 { 1822 {
1892 /* suppress compiler warnings */ 1823 /* suppress compiler warnings */
1893 ewhatstart = 0; 1824 ewhatstart = 0;
1894 ewhatflag = 0; 1825 ewhatflag = 0;
1895 estartlen = 0; 1826 estartlen = 0;
1896 } 1827 }
1828
1897 /* Init data to zero */ 1829 /* Init data to zero */
1898 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS); 1830 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1899 1831
1900 /* x,y are the real map locations. ax, ay are viewport relative 1832 /* x,y are the real map locations. ax, ay are viewport relative
1901 * locations. 1833 * locations.
… …
1905 /* We could do this logic as conditionals in the if statement, 1837 /* We could do this logic as conditionals in the if statement,
1906 * but that started to get a bit messy to look at. 1838 * but that started to get a bit messy to look at.
1907 */ 1839 */
1908 max_x = pl->x + (socket.mapx + 1) / 2; 1840 max_x = pl->x + (socket.mapx + 1) / 2;
1909 max_y = pl->y + (socket.mapy + 1) / 2; 1841 max_y = pl->y + (socket.mapy + 1) / 2;
1842
1910 if (socket.mapmode == Map1aCmd) 1843 if (socket.mapmode == Map1aCmd)
1911 { 1844 {
1912 max_x += MAX_HEAD_OFFSET; 1845 max_x += MAX_HEAD_OFFSET;
1913 max_y += MAX_HEAD_OFFSET; 1846 max_y += MAX_HEAD_OFFSET;
1914 } 1847 }
… …
1929 */ 1862 */
1930 if (ax >= socket.mapx || ay >= socket.mapy) 1863 if (ax >= socket.mapx || ay >= socket.mapy)
1931 { 1864 {
1932 int i, got_one; 1865 int i, got_one;
1933 1866
1934 oldlen = sl.len; 1867 oldlen = sl.length ();
1935 1868
1936 SockList_AddShort (&sl, mask); 1869 sl << uint16 (mask);
1937 1870
1938 if (check_head (sl, socket, ax, ay, 2)) 1871 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1939 mask |= 0x4;
1940 if (check_head (sl, socket, ax, ay, 1)) 1872 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1941 mask |= 0x2;
1942 if (check_head (sl, socket, ax, ay, 0)) 1873 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1943 mask |= 0x1;
1944 1874
1945 /* If all we are doing is sending 0 (blank) faces, we don't 1875 /* If all we are doing is sending 0 (blank) faces, we don't
1946 * actually need to send that - just the coordinates 1876 * actually need to send that - just the coordinates
1947 * with no faces tells the client to blank out the 1877 * with no faces tells the client to blank out the
1948 * space. 1878 * space.
1949 */ 1879 */
1950 got_one = 0; 1880 got_one = 0;
1951 for (i = oldlen + 2; i < sl.len; i++) 1881 for (i = oldlen + 2; i < sl.length (); i++)
1952 {
1953 if (sl.buf[i]) 1882 if (sl.buf[i])
1954 got_one = 1; 1883 got_one = 1;
1955 }
1956 1884
1957 if (got_one && (mask & 0xf)) 1885 if (got_one && (mask & 0xf))
1958 {
1959 sl.buf[oldlen + 1] = mask & 0xff; 1886 sl.buf[oldlen + 1] = mask & 0xff;
1960 }
1961 else 1887 else
1962 { /*either all faces blank, either no face at all */ 1888 { /*either all faces blank, either no face at all */
1963 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ 1889 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1964 sl.len = oldlen + 2; 1890 sl.reset (oldlen + 2);
1965 else 1891 else
1966 sl.len = oldlen; 1892 sl.reset (oldlen);
1967 } 1893 }
1894
1968 /*What concerns extendinfos, nothing to be done for now 1895 /*What concerns extendinfos, nothing to be done for now
1969 * (perhaps effects layer later) 1896 * (perhaps effects layer later)
1970 */ 1897 */
1971 continue; /* don't do processing below */ 1898 continue; /* don't do processing below */
1972 } 1899 }
1973 1900
1974 MapCell & lastcell = socket.lastmap.cells[ax][ay]; 1901 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1975 1902
1976 d = pl->contr->blocked_los[ax][ay]; 1903 d = pl->contr->blocked_los[ax][ay];
1977 1904
1978 /* If the coordinates are not valid, or it is too dark to see, 1905 /* If the coordinates are not valid, or it is too dark to see,
1979 * we tell the client as such 1906 * we tell the client as such
1980 */ 1907 */
1981 nx = x; 1908 nx = x;
1982 ny = y; 1909 ny = y;
1983 m = get_map_from_coord (pl->map, &nx, &ny); 1910 m = get_map_from_coord (pl->map, &nx, &ny);
1911
1984 if (!m) 1912 if (!m)
1985 { 1913 {
1986 /* space is out of map. Update space and clear values 1914 /* space is out of map. Update space and clear values
1987 * if this hasn't already been done. If the space is out 1915 * if this hasn't already been done. If the space is out
1988 * of the map, it shouldn't have a head 1916 * of the map, it shouldn't have a head
1989 */ 1917 */
1990 if (lastcell.count != -1) 1918 if (lastcell.count != -1)
1991 { 1919 {
1992 SockList_AddShort (&sl, mask); 1920 sl << uint16 (mask);
1993 map_clearcell (&lastcell, 0, 0, 0, -1); 1921 map_clearcell (&lastcell, 0, 0, 0, -1);
1994 } 1922 }
1995 } 1923 }
1996 else if (d > 3) 1924 else if (d > 3)
1997 { 1925 {
… …
1999 1927
2000 /* This block deals with spaces that are not visible for whatever 1928 /* This block deals with spaces that are not visible for whatever
2001 * reason. Still may need to send the head for this space. 1929 * reason. Still may need to send the head for this space.
2002 */ 1930 */
2003 1931
2004 oldlen = sl.len; 1932 oldlen = sl.length ();
2005 1933
2006 SockList_AddShort (&sl, mask); 1934 sl << uint16 (mask);
1935
2007 if (lastcell.count != -1) 1936 if (lastcell.count != -1)
2008 need_send = 1; 1937 need_send = 1;
1938
2009 count = -1; 1939 count = -1;
2010 1940
2011 if (socket.mapmode == Map1aCmd && have_head (ax, ay)) 1941 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
2012 { 1942 {
2013 /* Now check to see if any heads need to be sent */ 1943 /* Now check to see if any heads need to be sent */
2014 1944
2015 if (check_head (sl, socket, ax, ay, 2)) 1945 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
2016 mask |= 0x4;
2017 if (check_head (sl, socket, ax, ay, 1)) 1946 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
2018 mask |= 0x2;
2019 if (check_head (sl, socket, ax, ay, 0)) 1947 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
2020 mask |= 0x1;
2021 1948
2022 lastcell.count = count; 1949 lastcell.count = count;
2023
2024 } 1950 }
2025 else 1951 else
2026 { 1952 {
2027 struct MapCell *cell = &lastcell;
2028
2029 /* properly clear a previously sent big face */ 1953 /* properly clear a previously sent big face */
2030 if (cell->faces[0] != 0 || cell->faces[1] != 0 || cell->faces[2] != 0) 1954 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0
1955 || lastcell.stat_hp || lastcell.flags || lastcell.player)
2031 need_send = 1; 1956 need_send = 1;
1957
2032 map_clearcell (&lastcell, 0, 0, 0, count); 1958 map_clearcell (&lastcell, 0, 0, 0, count);
2033 } 1959 }
2034 1960
2035 if ((mask & 0xf) || need_send) 1961 if ((mask & 0xf) || need_send)
2036 {
2037 sl.buf[oldlen + 1] = mask & 0xff; 1962 sl.buf[oldlen + 1] = mask & 0xff;
2038 }
2039 else 1963 else
2040 {
2041 sl.len = oldlen; 1964 sl.reset (oldlen);
2042 }
2043 } 1965 }
2044 else 1966 else
2045 { 1967 {
2046 /* In this block, the space is visible or there are head objects 1968 /* In this block, the space is visible or there are head objects
2047 * we need to send. 1969 * we need to send.
… …
2049 1971
2050 /* Rather than try to figure out what everything that we might 1972 /* Rather than try to figure out what everything that we might
2051 * need to send is, then form the packet after that, 1973 * need to send is, then form the packet after that,
2052 * we presume that we will in fact form a packet, and update 1974 * we presume that we will in fact form a packet, and update
2053 * the bits by what we do actually send. If we send nothing, 1975 * the bits by what we do actually send. If we send nothing,
2054 * we just back out sl.len to the old value, and no harm 1976 * we just back out sl.length () to the old value, and no harm
2055 * is done. 1977 * is done.
2056 * I think this is simpler than doing a bunch of checks to see 1978 * I think this is simpler than doing a bunch of checks to see
2057 * what if anything we need to send, setting the bits, then 1979 * what if anything we need to send, setting the bits, then
2058 * doing those checks again to add the real data. 1980 * doing those checks again to add the real data.
2059 */ 1981 */
2060 oldlen = sl.len; 1982 oldlen = sl.length ();
2061 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1983 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2062 eoldlen = esl.len; 1984 eoldlen = esl.length ();
2063 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1985 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2064 SockList_AddShort (&sl, mask); 1986 sl << uint16 (mask);
2065 1987
2066 if (socket.ext_mapinfos) 1988 if (socket.ext_mapinfos)
2067 SockList_AddShort (&esl, emask); 1989 esl << uint16 (emask);
2068 1990
2069 unsigned char dummy; 1991 unsigned char dummy;
2070 unsigned char *last_ext = &dummy; 1992 unsigned char *last_ext = &dummy;
2071 1993
2072 /* Darkness changed */ 1994 /* Darkness changed */
… …
2075 mask |= 0x8; 1997 mask |= 0x8;
2076 1998
2077 if (socket.extmap) 1999 if (socket.extmap)
2078 { 2000 {
2079 *last_ext |= 0x80; 2001 *last_ext |= 0x80;
2080 last_ext = sl.buf + sl.len; 2002 last_ext = sl.buf + sl.length ();
2081 SockList_AddChar (&sl, d); 2003 sl << uint8 (d);
2082 } 2004 }
2083 else 2005 else
2084 SockList_AddChar (&sl, 255 - 64 * d); 2006 sl << uint8 (255 - 64 * d);
2085 } 2007 }
2086 2008
2087 lastcell.count = d; 2009 lastcell.count = d;
2088 2010
2089 if (socket.extmap) 2011 if (socket.extmap)
2090 { 2012 {
2091 uint8 stat_hp = 0; 2013 uint8 stat_hp = 0;
2092 uint8 stat_width = 0; 2014 uint8 stat_width = 0;
2093 uint8 flags = 0; 2015 uint8 flags = 0;
2094 tag_t player = 0; 2016 UUID player = 0;
2095 2017
2096 // send hp information, if applicable 2018 // send hp information, if applicable
2097 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 2019 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))
2098 { 2020 {
2099 if (op->head || op->invisible) 2021 if (op->head || op->invisible)
… …
2119 { 2041 {
2120 lastcell.stat_hp = stat_hp; 2042 lastcell.stat_hp = stat_hp;
2121 2043
2122 mask |= 0x8; 2044 mask |= 0x8;
2123 *last_ext |= 0x80; 2045 *last_ext |= 0x80;
2124 last_ext = sl.buf + sl.len; 2046 last_ext = sl.buf + sl.length ();
2125 SockList_AddChar (&sl, 5); 2047
2126 SockList_AddChar (&sl, stat_hp); 2048 sl << uint8 (5) << uint8 (stat_hp);
2127 2049
2128 if (stat_width > 1) 2050 if (stat_width > 1)
2129 { 2051 {
2130 *last_ext |= 0x80; 2052 *last_ext |= 0x80;
2131 last_ext = sl.buf + sl.len; 2053 last_ext = sl.buf + sl.length ();
2132 SockList_AddChar (&sl, 6); 2054
2133 SockList_AddChar (&sl, stat_width); 2055 sl << uint8 (6) << uint8 (stat_width);
2134 } 2056 }
2135 } 2057 }
2136 2058
2137 if (lastcell.player != player) 2059 if (lastcell.player != player)
2138 { 2060 {
2139 lastcell.player = player; 2061 lastcell.player = player;
2140 2062
2141 mask |= 0x8; 2063 mask |= 0x8;
2142 *last_ext |= 0x80; 2064 *last_ext |= 0x80;
2143 last_ext = sl.buf + sl.len; 2065 last_ext = sl.buf + sl.length ();
2144 SockList_AddChar (&sl, 0x47); 2066
2145 SockList_AddChar (&sl, 4); 2067 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2146 SockList_AddInt (&sl, player);
2147 } 2068 }
2148 2069
2149 if (lastcell.flags != flags) 2070 if (lastcell.flags != flags)
2150 { 2071 {
2151 lastcell.flags = flags; 2072 lastcell.flags = flags;
2152 2073
2153 mask |= 0x8; 2074 mask |= 0x8;
2154 *last_ext |= 0x80; 2075 *last_ext |= 0x80;
2155 last_ext = sl.buf + sl.len; 2076 last_ext = sl.buf + sl.length ();
2156 SockList_AddChar (&sl, 8); 2077
2157 SockList_AddChar (&sl, flags); 2078 sl << uint8 (8) << uint8 (flags);
2158 } 2079 }
2159 } 2080 }
2160 2081
2161 /* Floor face */ 2082 /* Floor face */
2162 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 2)) 2083 if (update_space (sl, socket, m, nx, ny, ax, ay, 2))
2163 mask |= 0x4; 2084 mask |= 0x4;
2164 2085
2165 if (socket.EMI_smooth) 2086 if (socket.EMI_smooth)
2166 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 2)) 2087 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
2167 emask |= 0x4; 2088 emask |= 0x4;
2168 2089
2169 /* Middle face */ 2090 /* Middle face */
2170 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 1)) 2091 if (update_space (sl, socket, m, nx, ny, ax, ay, 1))
2171 mask |= 0x2; 2092 mask |= 0x2;
2172 2093
2173 if (socket.EMI_smooth) 2094 if (socket.EMI_smooth)
2174 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 1)) 2095 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
2175 emask |= 0x2; 2096 emask |= 0x2;
2176 2097
2177 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) 2098 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
2178 { 2099 {
2179 if (lastcell.faces[0] != pl->face->number) 2100 if (lastcell.faces[0] != pl->face->number)
2180 { 2101 {
2181 lastcell.faces[0] = pl->face->number; 2102 lastcell.faces[0] = pl->face->number;
2182 mask |= 0x1; 2103 mask |= 0x1;
2104
2183 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 2105 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
2184 esrv_send_face (&socket, pl->face->number, 0); 2106 esrv_send_face (&socket, pl->face->number, 0);
2185 SockList_AddShort (&sl, pl->face->number); 2107
2108 sl << uint16 (pl->face->number);
2186 } 2109 }
2187 } 2110 }
2188 /* Top face */
2189 else 2111 else
2190 { 2112 {
2113 /* Top face */
2191 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 0)) 2114 if (update_space (sl, socket, m, nx, ny, ax, ay, 0))
2192 mask |= 0x1; 2115 mask |= 0x1;
2116
2193 if (socket.EMI_smooth) 2117 if (socket.EMI_smooth)
2194 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 0)) 2118 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
2195 {
2196 emask |= 0x1; 2119 emask |= 0x1;
2197 }
2198 } 2120 }
2121
2199 /* Check to see if we are in fact sending anything for this 2122 /* Check to see if we are in fact sending anything for this
2200 * space by checking the mask. If so, update the mask. 2123 * space by checking the mask. If so, update the mask.
2201 * if not, reset the len to that from before adding the mask 2124 * if not, reset the len to that from before adding the mask
2202 * value, so we don't send those bits. 2125 * value, so we don't send those bits.
2203 */ 2126 */
2204 if (mask & 0xf) 2127 if (mask & 0xf)
2205 {
2206 sl.buf[oldlen + 1] = mask & 0xff; 2128 sl.buf[oldlen + 1] = mask & 0xff;
2207 }
2208 else 2129 else
2209 {
2210 sl.len = oldlen; 2130 sl.reset (oldlen);
2211 } 2131
2212 if (emask & 0xf) 2132 if (emask & 0xf)
2213 {
2214 esl.buf[eoldlen + 1] = emask & 0xff; 2133 esl.buf[eoldlen + 1] = emask & 0xff;
2215 }
2216 else 2134 else
2217 {
2218 esl.len = eoldlen; 2135 esl.reset (eoldlen);
2219 }
2220 } /* else this is a viewable space */ 2136 } /* else this is a viewable space */
2221 } /* for x loop */ 2137 } /* for x loop */
2222 } /* for y loop */ 2138 } /* for y loop */
2223 2139
2224 /* Verify that we in fact do need to send this */ 2140 /* Verify that we in fact do need to send this */
2225 if (socket.ext_mapinfos) 2141 if (socket.ext_mapinfos)
2226 { 2142 {
2227 if (!(sl.len > startlen || socket.sent_scroll)) 2143 if (!(sl.length () > startlen || socket.sent_scroll))
2228 { 2144 {
2229 /* No map data will follow, so don't say the client 2145 /* No map data will follow, so don't say the client
2230 * it doesn't need draw! 2146 * it doesn't need draw!
2231 */ 2147 */
2232 ewhatflag &= (~EMI_NOREDRAW); 2148 ewhatflag &= (~EMI_NOREDRAW);
2233 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 2149 esl.buf[ewhatstart + 1] = ewhatflag & 0xff;
2234 } 2150 }
2235 2151
2236 if (esl.len > estartlen) 2152 if (esl.length () > estartlen)
2237 Send_With_Handling (&socket, &esl); 2153 Send_With_Handling (&socket, &esl);
2238
2239 free (esl.buf);
2240 } 2154 }
2241 2155
2242 if (sl.len > startlen || socket.sent_scroll) 2156 if (sl.length () > startlen || socket.sent_scroll)
2243 { 2157 {
2244 Send_With_Handling (&socket, &sl); 2158 Send_With_Handling (&socket, &sl);
2245 socket.sent_scroll = 0; 2159 socket.sent_scroll = 0;
2246 } 2160 }
2247
2248 free (sl.buf);
2249} 2161}
2250 2162
2251/** 2163/**
2252 * Draws client map. 2164 * Draws client map.
2253 */ 2165 */
… …
2304 { 2216 {
2305 update_los (pl); 2217 update_los (pl);
2306 pl->contr->do_los = 0; 2218 pl->contr->do_los = 0;
2307 } 2219 }
2308 2220
2309 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd)
2310 {
2311 /* Big maps need a different drawing mechanism to work */ 2221 /* Big maps need a different drawing mechanism to work */
2312 draw_client_map1 (pl); 2222 draw_client_map1 (pl);
2313 return;
2314 }
2315
2316 if (pl->invisible & (pl->invisible < 50 ? 4 : 1))
2317 {
2318 esrv_map_setbelow (&pl->contr->socket, pl->contr->socket.mapx / 2, pl->contr->socket.mapy / 2, pl->face->number, &newmap);
2319 }
2320
2321 /* j and i are the y and x coordinates of the real map (which is
2322 * basically some number of spaces around the player)
2323 * ax and ay are values from within the viewport (ie, 0, 0 is upper
2324 * left corner) and are thus disconnected from the map values.
2325 * Subtract 1 from the max values so that we properly handle cases where
2326 * player has specified an even map. Otherwise, we try to send them too
2327 * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually
2328 * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is
2329 * odd, this still works fine.
2330 */
2331 ay = 0;
2332 for (j = pl->y - pl->contr->socket.mapy / 2; j <= pl->y + (pl->contr->socket.mapy - 1) / 2; j++, ay++)
2333 {
2334 ax = 0;
2335 for (i = pl->x - pl->contr->socket.mapx / 2; i <= pl->x + (pl->contr->socket.mapx - 1) / 2; i++, ax++)
2336 {
2337
2338 d = pl->contr->blocked_los[ax][ay];
2339 /* note the out_of_map and d>3 checks are both within the same
2340 * negation check.
2341 */
2342 nx = i;
2343 ny = j;
2344 m = get_map_from_coord (pm, &nx, &ny);
2345 if (m && d < 4)
2346 {
2347 face = GET_MAP_FACE (m, nx, ny, 0);
2348 floor2 = GET_MAP_FACE (m, nx, ny, 1);
2349 floor = GET_MAP_FACE (m, nx, ny, 2);
2350
2351 /* If all is blank, send a blank face. */
2352 if ((!face || face == blank_face) && (!floor2 || floor2 == blank_face) && (!floor || floor == blank_face))
2353 {
2354 esrv_map_setbelow (&pl->contr->socket, ax, ay, blank_face->number, &newmap);
2355 }
2356 else
2357 { /* actually have something interesting */
2358 /* send the darkness mask, if any. */
2359 if (d && pl->contr->socket.darkness)
2360 esrv_map_setbelow (&pl->contr->socket, ax, ay, dark_faces[d - 1]->number, &newmap);
2361
2362 if (face && face != blank_face)
2363 esrv_map_setbelow (&pl->contr->socket, ax, ay, face->number, &newmap);
2364 if (floor2 && floor2 != blank_face)
2365 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor2->number, &newmap);
2366 if (floor && floor != blank_face)
2367 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap);
2368 }
2369 } /* Is a valid space */
2370 }
2371 }
2372 esrv_map_doneredraw (&pl->contr->socket, &newmap);
2373
2374 check_map_change (pl->contr);
2375} 2223}
2376 2224
2377 2225
2378/*****************************************************************************/ 2226/*****************************************************************************/
2379 2227
… …
2385 2233
2386/*****************************************************************************/ 2234/*****************************************************************************/
2387void 2235void
2388send_plugin_custom_message (object *pl, char *buf) 2236send_plugin_custom_message (object *pl, char *buf)
2389{ 2237{
2390 cs_write_string (&pl->contr->socket, buf, strlen (buf)); 2238 pl->contr->socket.send_packet (buf);
2391} 2239}
2392 2240
2393/** 2241/**
2394 * This sends the skill number to name mapping. We ignore 2242 * This sends the skill number to name mapping. We ignore
2395 * the params - we always send the same info no matter what. 2243 * the params - we always send the same info no matter what.
2396 */ 2244 */
2397void 2245void
2398send_skill_info (NewSocket * ns, char *params) 2246send_skill_info (NewSocket *ns, char *params)
2399{ 2247{
2400 SockList sl; 2248 packet sl;
2401 int i; 2249 sl << "replyinfo skill_info\n";
2402 2250
2403 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
2404 strcpy ((char *) sl.buf, "replyinfo skill_info\n");
2405 for (i = 1; i < NUM_SKILLS; i++) 2251 for (int i = 1; i < NUM_SKILLS; i++)
2406 { 2252 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2407 sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 2253
2408 }
2409 sl.len = strlen ((char *) sl.buf);
2410 if (sl.len >= MAXSOCKBUF) 2254 if (sl.length () >= MAXSOCKBUF)
2411 { 2255 {
2412 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2256 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2413 fatal (0); 2257 fatal (0);
2414 } 2258 }
2259
2415 Send_With_Handling (ns, &sl); 2260 Send_With_Handling (ns, &sl);
2416 free (sl.buf);
2417} 2261}
2418 2262
2419/** 2263/**
2420 * This sends the spell path to name mapping. We ignore 2264 * This sends the spell path to name mapping. We ignore
2421 * the params - we always send the same info no matter what. 2265 * the params - we always send the same info no matter what.
2422 */ 2266 */
2423void 2267void
2424send_spell_paths (NewSocket * ns, char *params) 2268send_spell_paths (NewSocket * ns, char *params)
2425{ 2269{
2426 SockList sl; 2270 packet sl;
2427 int i;
2428 2271
2429 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2272 sl << "replyinfo spell_paths\n";
2430 strcpy ((char *) sl.buf, "replyinfo spell_paths\n"); 2273
2431 for (i = 0; i < NRSPELLPATHS; i++) 2274 for (int i = 0; i < NRSPELLPATHS; i++)
2432 sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", 1 << i, spellpathnames[i]); 2275 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2433 sl.len = strlen ((char *) sl.buf); 2276
2434 if (sl.len >= MAXSOCKBUF) 2277 if (sl.length () >= MAXSOCKBUF)
2435 { 2278 {
2436 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2279 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2437 fatal (0); 2280 fatal (0);
2438 } 2281 }
2282
2439 Send_With_Handling (ns, &sl); 2283 Send_With_Handling (ns, &sl);
2440 free (sl.buf);
2441} 2284}
2442 2285
2443/** 2286/**
2444 * This looks for any spells the player may have that have changed their stats. 2287 * This looks for any spells the player may have that have changed their stats.
2445 * it then sends an updspell packet for each spell that has changed in this way 2288 * it then sends an updspell packet for each spell that has changed in this way
2446 */ 2289 */
2447void 2290void
2448esrv_update_spells (player *pl) 2291esrv_update_spells (player *pl)
2449{ 2292{
2450 SockList sl;
2451 int flags = 0;
2452 object *spell;
2453
2454 if (!pl->socket.monitor_spells) 2293 if (!pl->socket.monitor_spells)
2455 return; 2294 return;
2295
2456 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2296 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2457 { 2297 {
2458 if (spell->type == SPELL) 2298 if (spell->type == SPELL)
2459 { 2299 {
2300 int flags = 0;
2301
2460 /* check if we need to update it */ 2302 /* check if we need to update it */
2461 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 2303 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
2462 { 2304 {
2463 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 2305 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2464 flags |= UPD_SP_MANA; 2306 flags |= UPD_SP_MANA;
2465 } 2307 }
2308
2466 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 2309 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
2467 { 2310 {
2468 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 2311 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2469 flags |= UPD_SP_GRACE; 2312 flags |= UPD_SP_GRACE;
2470 } 2313 }
2314
2471 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 2315 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
2472 { 2316 {
2473 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 2317 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2474 flags |= UPD_SP_DAMAGE; 2318 flags |= UPD_SP_DAMAGE;
2475 } 2319 }
2320
2476 if (flags != 0) 2321 if (flags)
2477 { 2322 {
2478 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2323 packet sl;
2479 strcpy ((char *) sl.buf, "updspell "); 2324
2480 sl.len = strlen ((char *) sl.buf); 2325 sl << "updspell "
2481 SockList_AddChar (&sl, flags); 2326 << uint8 (flags)
2482 SockList_AddInt (&sl, spell->count); 2327 << uint32 (spell->count);
2483 if (flags & UPD_SP_MANA) 2328
2484 SockList_AddShort (&sl, spell->last_sp); 2329 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2485 if (flags & UPD_SP_GRACE) 2330 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2486 SockList_AddShort (&sl, spell->last_grace); 2331 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2487 if (flags & UPD_SP_DAMAGE) 2332
2488 SockList_AddShort (&sl, spell->last_eat);
2489 flags = 0;
2490 Send_With_Handling (&pl->socket, &sl); 2333 Send_With_Handling (&pl->socket, &sl);
2491 free (sl.buf);
2492 } 2334 }
2493 } 2335 }
2494 } 2336 }
2495} 2337}
2496 2338
2497void 2339void
2498esrv_remove_spell (player *pl, object *spell) 2340esrv_remove_spell (player *pl, object *spell)
2499{ 2341{
2500 SockList sl;
2501
2502 if (!pl->socket.monitor_spells) 2342 if (!pl->socket.monitor_spells)
2503 return; 2343 return;
2344
2504 if (!pl || !spell || spell->env != pl->ob) 2345 if (!pl || !spell || spell->env != pl->ob)
2505 { 2346 {
2506 LOG (llevError, "Invalid call to esrv_remove_spell"); 2347 LOG (llevError, "Invalid call to esrv_remove_spell");
2507 return; 2348 return;
2508 } 2349 }
2509 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2350
2510 strcpy ((char *) sl.buf, "delspell "); 2351 packet sl;
2511 sl.len = strlen ((char *) sl.buf); 2352
2512 SockList_AddInt (&sl, spell->count); 2353 sl << "delspell "
2354 << uint32 (spell->count);
2355
2513 Send_With_Handling (&pl->socket, &sl); 2356 Send_With_Handling (&pl->socket, &sl);
2514 free (sl.buf);
2515} 2357}
2516 2358
2517/* appends the spell *spell to the Socklist we will send the data to. */ 2359/* appends the spell *spell to the Socklist we will send the data to. */
2518static void 2360static void
2519append_spell (player *pl, SockList * sl, object *spell) 2361append_spell (player *pl, packet &sl, object *spell)
2520{ 2362{
2521 int len, i, skill = 0; 2363 int len, i, skill = 0;
2522 2364
2523 if (!(spell->name)) 2365 if (!(spell->name))
2524 { 2366 {
2525 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 2367 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2526 return; 2368 return;
2527 } 2369 }
2528 SockList_AddInt (sl, spell->count); 2370
2529 SockList_AddShort (sl, spell->level);
2530 SockList_AddShort (sl, spell->casting_time);
2531 /* store costs and damage in the object struct, to compare to later */ 2371 /* store costs and damage in the object struct, to compare to later */
2532 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 2372 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2533 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 2373 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2534 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 2374 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2535 /* send the current values */
2536 SockList_AddShort (sl, spell->last_sp);
2537 SockList_AddShort (sl, spell->last_grace);
2538 SockList_AddShort (sl, spell->last_eat);
2539 2375
2540 /* figure out which skill it uses, if it uses one */ 2376 /* figure out which skill it uses, if it uses one */
2541 if (spell->skill) 2377 if (spell->skill)
2542 { 2378 {
2543 for (i = 1; i < NUM_SKILLS; i++) 2379 for (i = 1; i < NUM_SKILLS; i++)
… …
2545 { 2381 {
2546 skill = i + CS_STAT_SKILLINFO; 2382 skill = i + CS_STAT_SKILLINFO;
2547 break; 2383 break;
2548 } 2384 }
2549 } 2385 }
2550 SockList_AddChar (sl, skill);
2551 2386
2552 SockList_AddInt (sl, spell->path_attuned); 2387 /* send the current values */
2388 sl << uint32 (spell->count)
2389 << uint16 (spell->level)
2390 << uint16 (spell->casting_time)
2391 << uint16 (spell->last_sp)
2392 << uint16 (spell->last_grace)
2393 << uint16 (spell->last_eat)
2394 << uint8 (skill)
2395 << uint32 (spell->path_attuned)
2553 SockList_AddInt (sl, (spell->face) ? spell->face->number : 0); 2396 << uint32 (spell->face ? spell->face->number : 0)
2554 2397 << data8 (spell->name)
2555 len = strlen (spell->name); 2398 << data16 (spell->msg);
2556 SockList_AddChar (sl, (char) len);
2557 memcpy (sl->buf + sl->len, spell->name, len);
2558 sl->len += len;
2559
2560 if (!spell->msg)
2561 {
2562 SockList_AddShort (sl, 0);
2563 }
2564 else
2565 {
2566 len = strlen (spell->msg);
2567 SockList_AddShort (sl, len);
2568 memcpy (sl->buf + sl->len, spell->msg, len);
2569 sl->len += len;
2570 }
2571} 2399}
2572 2400
2573/** 2401/**
2574 * This tells the client to add the spell *ob, if *ob is NULL, then add 2402 * This tells the client to add the spell *ob, if *ob is NULL, then add
2575 * all spells in the player's inventory. 2403 * all spells in the player's inventory.
2576 */ 2404 */
2577void 2405void
2578esrv_add_spells (player *pl, object *spell) 2406esrv_add_spells (player *pl, object *spell)
2579{ 2407{
2580 SockList sl;
2581
2582 if (!pl) 2408 if (!pl)
2583 { 2409 {
2584 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2410 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2585 return; 2411 return;
2586 } 2412 }
2413
2587 if (!pl->socket.monitor_spells) 2414 if (!pl->socket.monitor_spells)
2588 return; 2415 return;
2589 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2416
2590 strcpy ((char *) sl.buf, "addspell "); 2417 packet sl;
2591 sl.len = strlen ((char *) sl.buf); 2418
2419 sl << "addspell ";
2420
2592 if (!spell) 2421 if (!spell)
2593 { 2422 {
2594 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2423 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2595 { 2424 {
2596 /* were we to simply keep appending data here, we could exceed 2425 /* were we to simply keep appending data here, we could exceed
… …
2606 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 2435 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2607 * like it will fix this 2436 * like it will fix this
2608 */ 2437 */
2609 if (spell->type != SPELL) 2438 if (spell->type != SPELL)
2610 continue; 2439 continue;
2440
2611 if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2441 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2612 { 2442 {
2613 Send_With_Handling (&pl->socket, &sl); 2443 Send_With_Handling (&pl->socket, &sl);
2614 strcpy ((char *) sl.buf, "addspell "); 2444
2615 sl.len = strlen ((char *) sl.buf); 2445 sl.reset ();
2446 sl << "addspell ";
2616 } 2447 }
2448
2617 append_spell (pl, &sl, spell); 2449 append_spell (pl, sl, spell);
2618 } 2450 }
2619 } 2451 }
2620 else if (spell->type != SPELL) 2452 else if (spell->type != SPELL)
2621 { 2453 {
2622 LOG (llevError, "Asked to send a non-spell object as a spell"); 2454 LOG (llevError, "Asked to send a non-spell object as a spell");
2623 return; 2455 return;
2624 } 2456 }
2625 else 2457 else
2626 append_spell (pl, &sl, spell); 2458 append_spell (pl, sl, spell);
2459
2627 if (sl.len >= MAXSOCKBUF) 2460 if (sl.length () >= MAXSOCKBUF)
2628 { 2461 {
2629 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2462 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2630 fatal (0); 2463 fatal (0);
2631 } 2464 }
2465
2632 /* finally, we can send the packet */ 2466 /* finally, we can send the packet */
2633 Send_With_Handling (&pl->socket, &sl); 2467 Send_With_Handling (&pl->socket, &sl);
2634 free (sl.buf); 2468
2635} 2469}
2470

Diff Legend

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