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.18 by root, Thu Sep 14 19:08:41 2006 UTC vs.
Revision 1.33 by root, Thu Dec 14 01:21:58 2006 UTC

1
2/*
3 * static char *rcsid_init_c =
4 * "$Id: request.C,v 1.18 2006/09/14 19:08:41 root Exp $";
5 */
6
7/* 1/*
8 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
9 3
10 Copyright (C) 2001 Mark Wedel 4 Copyright (C) 2001 Mark Wedel
11 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
22 16
23 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
24 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
25 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
26 20
27 The author can be reached via e-mail to crossfire-devel@real-time.com 21 The author can be reached via e-mail to <crossfire@schmorp.de>
28*/ 22*/
29 23
30/** 24/**
31 * \file 25 * \file
32 * Client handling. 26 * Client handling.
… …
63#include <commands.h> 57#include <commands.h>
64 58
65/* This block is basically taken from socket.c - I assume if it works there, 59/* This block is basically taken from socket.c - I assume if it works there,
66 * it should work here. 60 * it should work here.
67 */ 61 */
68#ifndef WIN32 /* ---win32 exclude unix headers */
69# include <sys/types.h> 62#include <sys/types.h>
70# include <sys/time.h> 63#include <sys/time.h>
71# include <sys/socket.h> 64#include <sys/socket.h>
72# include <netinet/in.h> 65#include <netinet/in.h>
73# include <netdb.h> 66#include <netdb.h>
74#endif /* win32 */
75 67
76#ifdef HAVE_UNISTD_H 68#ifdef HAVE_UNISTD_H
77# include <unistd.h> 69# include <unistd.h>
78#endif 70#endif
79 71
… …
110{ 102{
111 struct Map newmap; 103 struct Map newmap;
112 int x, y, mx, my; 104 int x, y, mx, my;
113 105
114 { 106 {
115 char buf[MAXSOCKBUF]; 107 packet sl;
116 108
117 sprintf (buf, "map_scroll %d %d", dx, dy); 109 sl.printf ("map_scroll %d %d", dx, dy);
118 Write_String_To_Socket (ns, buf, strlen (buf)); 110 ns->send_packet (sl);
119 } 111 }
120 112
121 /* If we are using the Map1aCmd, we may in fact send 113 /* If we are using the Map1aCmd, we may in fact send
122 * head information that is outside the viewable map. 114 * head information that is outside the viewable map.
123 * So set the mx,my to the max value we want to 115 * So set the mx,my to the max value we want to
… …
143 for (x = 0; x < mx; x++) 135 for (x = 0; x < mx; x++)
144 { 136 {
145 for (y = 0; y < my; y++) 137 for (y = 0; y < my; y++)
146 { 138 {
147 if (x >= ns->mapx || y >= ns->mapy) 139 if (x >= ns->mapx || y >= ns->mapy)
148 {
149 /* clear cells outside the viewable area */ 140 /* clear cells outside the viewable area */
150 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 141 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
151 }
152 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy) 142 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
153 {
154 /* clear newly visible tiles within the viewable area */ 143 /* clear newly visible tiles within the viewable area */
155 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 144 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
156 }
157 else 145 else
158 {
159 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 146 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
160 }
161 } 147 }
162 } 148 }
163 149
164 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 150 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
165 151
… …
175 NewSocket & socket = pl->socket; 161 NewSocket & socket = pl->socket;
176 162
177 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 163 memset (&socket.lastmap, 0, sizeof (socket.lastmap));
178 164
179 if (socket.newmapcmd == 1) 165 if (socket.newmapcmd == 1)
180 Write_String_To_Socket (&socket, "newmap", 6); 166 socket.send_packet ("newmap");
181 167
182 socket.update_look = 1; 168 socket.update_look = 1;
183 socket.look_position = 0; 169 socket.look_position = 0;
184} 170}
185 171
… …
216 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); 202 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path);
217 } 203 }
218 else 204 else
219 snprintf (buf, MAX_BUF, "mapinfo current"); 205 snprintf (buf, MAX_BUF, "mapinfo current");
220 206
221 Write_String_To_Socket (&socket, buf, strlen (buf)); 207 socket.send_packet (buf);
222 } 208 }
223 } 209 }
224 else if (socket.current_x != ob->x || socket.current_y != ob->y) 210 else if (socket.current_x != ob->x || socket.current_y != ob->y)
225 { 211 {
226 int dx = ob->x - socket.current_x; 212 int dx = ob->x - socket.current_x;
… …
264 if (!strncmp (buf, "spatial ", 8)) 250 if (!strncmp (buf, "spatial ", 8))
265 { 251 {
266 buf += 8; 252 buf += 8;
267 253
268 // initial map and its origin 254 // initial map and its origin
269 mapstruct *map = pl->ob->map; 255 maptile *map = pl->ob->map;
270 sint16 dx, dy; 256 sint16 dx, dy;
271 int mapx = pl->socket.mapx / 2 - pl->ob->x; 257 int mapx = pl->socket.mapx / 2 - pl->ob->x;
272 int mapy = pl->socket.mapy / 2 - pl->ob->y; 258 int mapy = pl->socket.mapy / 2 - pl->ob->y;
273 int max_distance = 8; // limit maximum path length to something generous 259 int max_distance = 8; // limit maximum path length to something generous
274 260
… …
328 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 314 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
329 } 315 }
330 else 316 else
331 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 317 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
332 318
333 Write_String_To_Socket (&pl->socket, bigbuf, strlen (bigbuf)); 319 pl->socket.send_packet (bigbuf);
334} 320}
335 321
336/** This is the Setup cmd - easy first implementation */ 322/** This is the Setup cmd - easy first implementation */
337void 323void
338SetUp (char *buf, int len, NewSocket * ns) 324SetUp (char *buf, int len, NewSocket * ns)
… …
345 * 331 *
346 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown 332 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
347 * The client then must sort this out 333 * The client then must sort this out
348 */ 334 */
349 335
350 LOG (llevInfo, "Get SetupCmd:: %s\n", buf); 336 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
337
351 strcpy (cmdback, "setup"); 338 strcpy (cmdback, "setup");
352 for (s = 0; s < len;) 339 for (s = 0; s < len; )
353 { 340 {
354
355 cmd = &buf[s]; 341 cmd = &buf[s];
356 342
357 /* find the next space, and put a null there */ 343 /* find the next space, and put a null there */
358 for (; buf[s] && buf[s] != ' '; s++); 344 for (; buf[s] && buf[s] != ' '; s++)
345 ;
346
359 buf[s++] = 0; 347 buf[s++] = 0;
348
360 while (buf[s] == ' ') 349 while (buf[s] == ' ')
361 s++; 350 s++;
362 351
363 if (s >= len) 352 if (s >= len)
364 break; 353 break;
365 354
366 param = &buf[s]; 355 param = &buf[s];
367 356
368 for (; buf[s] && buf[s] != ' '; s++); 357 for (; buf[s] && buf[s] != ' '; s++)
358 ;
359
369 buf[s++] = 0; 360 buf[s++] = 0;
361
370 while (buf[s] == ' ') 362 while (buf[s] == ' ')
371 s++; 363 s++;
372 364
373 slen = strlen (cmdback); 365 slen = strlen (cmdback);
374 safe_strcat (cmdback, " ", &slen, HUGE_BUF); 366 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
… …
535 * report a failure to the client. 527 * report a failure to the client.
536 */ 528 */
537 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF); 529 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
538 } 530 }
539 } /* for processing all the setup commands */ 531 } /* for processing all the setup commands */
532
540 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); 533 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
541 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 534 ns->send_packet (cmdback);
542} 535}
543 536
544/** 537/**
545 * The client has requested to be added to the game. 538 * The client has requested to be added to the game.
546 * This is what takes care of it. We tell the client how things worked out. 539 * This is what takes care of it. We tell the client how things worked out.
… …
552{ 545{
553 Settings oldsettings; 546 Settings oldsettings;
554 547
555 oldsettings = settings; 548 oldsettings = settings;
556 if (ns->status != Ns_Add || add_player (ns)) 549 if (ns->status != Ns_Add || add_player (ns))
557 { 550 ns->send_packet ("addme_failed");
558 Write_String_To_Socket (ns, "addme_failed", 12);
559 }
560 else 551 else
561 { 552 {
562 /* Basically, the add_player copies the socket structure into 553 /* Basically, the add_player copies the socket structure into
563 * the player structure, so this one (which is from init_sockets) 554 * the player structure, so this one (which is from init_sockets)
564 * is not needed anymore. The write below should still work, as the 555 * is not needed anymore. The write below should still work, as the
565 * stuff in ns is still relevant. 556 * stuff in ns is still relevant.
566 */ 557 */
567 Write_String_To_Socket (ns, "addme_success", 13); 558 ns->send_packet ("addme_success");
568 socket_info.nconns--; 559 socket_info.nconns--;
569 ns->status = Ns_Avail; 560 ns->status = Ns_Avail;
570 } 561 }
562
571 settings = oldsettings; 563 settings = oldsettings;
572} 564}
573 565
574/** Reply to ExtendedInfos command */ 566/** Reply to ExtendedInfos command */
575void 567void
… …
619 { 611 {
620 strcat (cmdback, " "); 612 strcat (cmdback, " ");
621 strcat (cmdback, "smoothing"); 613 strcat (cmdback, "smoothing");
622 } 614 }
623 615
624 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 616 ns->send_packet (cmdback);
625} 617}
626 618
627/* 619/*
628#define MSG_TYPE_BOOK 1 620#define MSG_TYPE_BOOK 1
629#define MSG_TYPE_CARD 2 621#define MSG_TYPE_CARD 2
… …
682 strcat (cmdback, " "); 674 strcat (cmdback, " ");
683 snprintf (temp, sizeof (temp), "%d", i); 675 snprintf (temp, sizeof (temp), "%d", i);
684 strcat (cmdback, temp); 676 strcat (cmdback, temp);
685 } 677 }
686 678
687 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 679 ns->send_packet (cmdback);
688} 680}
689 681
690/** 682/**
691 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 683 * A lot like the old AskSmooth (in fact, now called by AskSmooth).
692 * Basically, it makes no sense to wait for the client to request a 684 * Basically, it makes no sense to wait for the client to request a
… …
696 */ 688 */
697static void 689static void
698SendSmooth (NewSocket * ns, uint16 face) 690SendSmooth (NewSocket * ns, uint16 face)
699{ 691{
700 uint16 smoothface; 692 uint16 smoothface;
701 unsigned char reply[MAX_BUF];
702 SockList sl;
703 693
704 /* If we can't find a face, return and set it so we won't try to send this 694 /* If we can't find a face, return and set it so we won't try to send this
705 * again. 695 * again.
706 */ 696 */
707 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 697 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
… …
715 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 705 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
716 esrv_send_face (ns, smoothface, 0); 706 esrv_send_face (ns, smoothface, 0);
717 707
718 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 708 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
719 709
720 sl.buf = reply; 710 packet sl;
721 strcpy ((char *) sl.buf, "smooth "); 711
722 sl.len = strlen ((char *) sl.buf); 712 sl << "smooth "
723 SockList_AddShort (&sl, face); 713 << uint16 (face)
724 SockList_AddShort (&sl, smoothface); 714 << uint16 (smoothface);
715
725 Send_With_Handling (ns, &sl); 716 Send_With_Handling (ns, &sl);
726} 717}
727 718
728 /** 719 /**
729 * Tells client the picture it has to use 720 * Tells client the picture it has to use
… …
736 727
737 facenbr = atoi (buf); 728 facenbr = atoi (buf);
738 SendSmooth (ns, facenbr); 729 SendSmooth (ns, facenbr);
739} 730}
740 731
741
742
743
744
745/** 732/**
746 * This handles the general commands from the client (ie, north, fire, cast, 733 * This handles the general commands from the client (ie, north, fire, cast,
747 * etc.) 734 * etc.)
748 */ 735 */
749void 736void
… …
802 */ 789 */
803void 790void
804NewPlayerCmd (uint8 * buf, int len, player *pl) 791NewPlayerCmd (uint8 * buf, int len, player *pl)
805{ 792{
806 int time, repeat; 793 int time, repeat;
807 short packet;
808 unsigned char command[MAX_BUF]; 794 char command[MAX_BUF];
809 SockList sl; 795 int pktlen;
810 796
811 if (len < 7) 797 if (len < 7)
812 { 798 {
813 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 799 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
814 return; 800 return;
815 } 801 }
816 802
817 packet = GetShort_String (buf); 803 pktlen = net_uint16 (buf);
818 repeat = GetInt_String (buf + 2); 804 repeat = net_uint32 (buf + 2);
805
819 /* -1 is special - no repeat, but don't update */ 806 /* -1 is special - no repeat, but don't update */
820 if (repeat != -1) 807 if (repeat != -1)
821 {
822 pl->count = repeat; 808 pl->count = repeat;
823 } 809
824 if ((len - 4) >= MAX_BUF) 810 if ((len - 4) >= MAX_BUF)
825 len = MAX_BUF - 5; 811 len = MAX_BUF - 5;
826 812
827 strncpy ((char *) command, (char *) buf + 6, len - 4); 813 strncpy ((char *) command, (char *) buf + 6, len - 4);
828 command[len - 4] = '\0'; 814 command[len - 4] = '\0';
… …
838 return; 824 return;
839 } 825 }
840 826
841 /* This should not happen anymore. */ 827 /* This should not happen anymore. */
842 if (pl->ob->speed_left < -1.0) 828 if (pl->ob->speed_left < -1.0)
843 {
844 LOG (llevError, "Player has negative time - shouldn't do command.\n"); 829 LOG (llevError, "Player has negative time - shouldn't do command.\n");
845 } 830
846 /* In c_new.c */ 831 /* In c_new.c */
847 execute_newserver_command (pl->ob, (char *) command); 832 execute_newserver_command (pl->ob, (char *) command);
848 /* Perhaps something better should be done with a left over count. 833 /* Perhaps something better should be done with a left over count.
849 * Cleaning up the input should probably be done first - all actions 834 * Cleaning up the input should probably be done first - all actions
850 * for the command that issued the count should be done before any other 835 * for the command that issued the count should be done before any other
851 * commands. 836 * commands.
852 */ 837 */
853 pl->count = 0; 838 pl->count = 0;
854 839
855 /* Send confirmation of command execution now */
856 sl.buf = command;
857 strcpy ((char *) sl.buf, "comc ");
858 sl.len = 5;
859 SockList_AddShort (&sl, packet);
860 if (FABS (pl->ob->speed) < 0.001) 840 if (FABS (pl->ob->speed) < 0.001)
861 time = MAX_TIME * 100; 841 time = MAX_TIME * 100;
862 else 842 else
863 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 843 time = (int) (MAX_TIME / FABS (pl->ob->speed));
864 SockList_AddInt (&sl, time); 844
845 /* Send confirmation of command execution now */
846
847 packet sl;
848 sl << "comc " << uint16 (pktlen) << uint32 (time);
865 Send_With_Handling (&pl->socket, &sl); 849 Send_With_Handling (&pl->socket, &sl);
866} 850}
867 851
868 852
869/** This is a reply to a previous query. */ 853/** This is a reply to a previous query. */
… …
982 /* these are old dxclients */ 966 /* these are old dxclients */
983 /* Version 1024 added support for singular + plural name values - 967 /* Version 1024 added support for singular + plural name values -
984 * requiing this minimal value reduces complexity of that code, and it 968 * requiing this minimal value reduces complexity of that code, and it
985 * has been around for a long time. 969 * has been around for a long time.
986 */ 970 */
987 if (!strcmp (" CF DX CLIENT", cp) || ns->sc_version < 1024) 971 if (ns->sc_version < 1026)
988 { 972 {
989 sprintf (version_warning, "drawinfo %d %s", NDI_RED, 973 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
990 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 974 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
991 Write_String_To_Socket (ns, version_warning, strlen (version_warning)); 975 ns->send_packet (version_warning);
992 } 976 }
993 977
994 } 978 }
995} 979}
996 980
… …
1068send_query (NewSocket * ns, uint8 flags, char *text) 1052send_query (NewSocket * ns, uint8 flags, char *text)
1069{ 1053{
1070 char buf[MAX_BUF]; 1054 char buf[MAX_BUF];
1071 1055
1072 sprintf (buf, "query %d %s", flags, text ? text : ""); 1056 sprintf (buf, "query %d %s", flags, text ? text : "");
1073 Write_String_To_Socket (ns, buf, strlen (buf)); 1057 ns->send_packet (buf);
1074} 1058}
1075 1059
1076#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1060#define AddIfInt64(Old,New,Type) if (Old != New) {\
1077 Old = New; \ 1061 Old = New; \
1078 SockList_AddChar(&sl, Type); \ 1062 sl << uint8 (Type) << uint64 (New); \
1079 SockList_AddInt64(&sl, New); \
1080 } 1063 }
1081 1064
1082#define AddIfInt(Old,New,Type) if (Old != New) {\ 1065#define AddIfInt(Old,New,Type) if (Old != New) {\
1083 Old = New; \ 1066 Old = New; \
1084 SockList_AddChar(&sl, Type); \ 1067 sl << uint8 (Type) << uint32 (New); \
1085 SockList_AddInt(&sl, New); \
1086 } 1068 }
1087 1069
1088#define AddIfShort(Old,New,Type) if (Old != New) {\ 1070#define AddIfShort(Old,New,Type) if (Old != New) {\
1089 Old = New; \ 1071 Old = New; \
1090 SockList_AddChar(&sl, Type); \ 1072 sl << uint8 (Type) << uint16 (New); \
1091 SockList_AddShort(&sl, New); \
1092 } 1073 }
1093 1074
1094#define AddIfFloat(Old,New,Type) if (Old != New) {\ 1075#define AddIfFloat(Old,New,Type) if (Old != New) {\
1095 Old = New; \ 1076 Old = New; \
1096 SockList_AddChar(&sl, Type); \ 1077 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \
1097 SockList_AddInt(&sl,(long)(New*FLOAT_MULTI));\
1098 } 1078 }
1099 1079
1100#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 1080#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1101 if (Old) free(Old);\
1102 Old = strdup_local(New);\ 1081 free(Old); Old = strdup (New);\
1103 SockList_AddChar(&sl, Type); \ 1082 sl << uint8 (Type) << data8 (New); \
1104 SockList_AddChar(&sl, ( char )strlen(New)); \
1105 strcpy((char*)sl.buf + sl.len, New); \
1106 sl.len += strlen(New); \
1107 } 1083 }
1108 1084
1109/** 1085/**
1110 * Sends a statistics update. We look at the old values, 1086 * Sends a statistics update. We look at the old values,
1111 * and only send what has changed. Stat mapping values are in newclient.h 1087 * and only send what has changed. Stat mapping values are in newclient.h
… …
1113 * commands for now. 1089 * commands for now.
1114 */ 1090 */
1115void 1091void
1116esrv_update_stats (player *pl) 1092esrv_update_stats (player *pl)
1117{ 1093{
1118 SockList sl;
1119 char buf[MAX_BUF]; 1094 char buf[MAX_BUF];
1120 uint16 flags; 1095 uint16 flags;
1121 1096
1122 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1097 packet sl;
1123 strcpy ((char *) sl.buf, "stats "); 1098 sl << "stats ";
1124 sl.len = strlen ((char *) sl.buf);
1125 1099
1126 if (pl->ob != NULL) 1100 if (pl->ob != NULL)
1127 { 1101 {
1128 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1102 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
1129 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1103 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
… …
1137 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); 1111 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1138 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1112 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);
1139 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1113 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1140 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1114 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1141 } 1115 }
1116
1142 if (pl->socket.exp64) 1117 if (pl->socket.exp64)
1143 { 1118 {
1144 uint8 s; 1119 uint8 s;
1145 1120
1146 for (s = 0; s < NUM_SKILLS; s++) 1121 for (s = 0; s < NUM_SKILLS; s++)
1147 { 1122 {
1148 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1123 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1149 { 1124 {
1150
1151 /* Always send along the level if exp changes. This is only 1125 /* Always send along the level if exp changes. This is only
1152 * 1 extra byte, but keeps processing simpler. 1126 * 1 extra byte, but keeps processing simpler.
1153 */ 1127 */
1154 SockList_AddChar (&sl, (char) (s + CS_STAT_SKILLINFO)); 1128 sl << uint8 (s + CS_STAT_SKILLINFO)
1155 SockList_AddChar (&sl, (char) pl->last_skill_ob[s]->level); 1129 << uint8 (pl->last_skill_ob[s]->level)
1156 SockList_AddInt64 (&sl, pl->last_skill_ob[s]->stats.exp); 1130 << uint64 (pl->last_skill_ob[s]->stats.exp);
1131
1157 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1132 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1158 } 1133 }
1159 } 1134 }
1160 } 1135 }
1136
1161 if (pl->socket.exp64) 1137 if (pl->socket.exp64)
1162 {
1163 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); 1138 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1164 }
1165 else 1139 else
1166 {
1167 AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP); 1140 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1168 } 1141
1169 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1142 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
1170 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1143 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);
1171 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1144 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);
1172 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1145 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);
1173 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1146 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
1174 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1147 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD);
1175 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 1148 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1176 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); 1149 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);
1177 flags = 0; 1150 flags = 0;
1151
1178 if (pl->fire_on) 1152 if (pl->fire_on)
1179 flags |= SF_FIREON; 1153 flags |= SF_FIREON;
1154
1180 if (pl->run_on) 1155 if (pl->run_on)
1181 flags |= SF_RUNON; 1156 flags |= SF_RUNON;
1182 1157
1183 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1158 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1159
1184 if (pl->socket.sc_version < 1025) 1160 if (pl->socket.sc_version < 1025)
1185 {
1186 AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR); 1161 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1187 }
1188 else 1162 else
1189 { 1163 {
1190 int i; 1164 int i;
1191 1165
1192 for (i = 0; i < NROFATTACKS; i++) 1166 for (i = 0; i < NROFATTACKS; i++)
1193 { 1167 {
1194 /* Skip ones we won't send */ 1168 /* Skip ones we won't send */
1195 if (atnr_cs_stat[i] == -1) 1169 if (atnr_cs_stat[i] == -1)
1196 continue; 1170 continue;
1171
1197 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1172 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1198 } 1173 }
1199 } 1174 }
1175
1200 if (pl->socket.monitor_spells) 1176 if (pl->socket.monitor_spells)
1201 { 1177 {
1202 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1178 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1203 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1179 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
1204 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1180 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1205 } 1181 }
1182
1206 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1183 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */
1207 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); 1184 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE);
1208 set_title (pl->ob, buf); 1185 set_title (pl->ob, buf);
1209 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1186 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE);
1210 1187
… …
1214#ifdef ESRV_DEBUG 1191#ifdef ESRV_DEBUG
1215 LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len); 1192 LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len);
1216#endif 1193#endif
1217 Send_With_Handling (&pl->socket, &sl); 1194 Send_With_Handling (&pl->socket, &sl);
1218 } 1195 }
1219 free (sl.buf);
1220}
1221 1196
1197}
1222 1198
1223/** 1199/**
1224 * Tells the client that here is a player it should start using. 1200 * Tells the client that here is a player it should start using.
1225 */ 1201 */
1226void 1202void
1227esrv_new_player (player *pl, uint32 weight) 1203esrv_new_player (player *pl, uint32 weight)
1228{ 1204{
1229 SockList sl;
1230
1231 pl->last_weight = weight; 1205 pl->last_weight = weight;
1232 1206
1233 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1207 packet sl;
1208 sl << "player ";
1234 1209
1235 strcpy ((char *) sl.buf, "player "); 1210 sl << uint32 (pl->ob->count)
1236 sl.len = strlen ((char *) sl.buf); 1211 << uint32 (weight)
1237 SockList_AddInt (&sl, pl->ob->count); 1212 << uint32 (pl->ob->face->number)
1238 SockList_AddInt (&sl, weight); 1213 << data8 (pl->ob->name);
1239 SockList_AddInt (&sl, pl->ob->face->number);
1240
1241 SockList_AddChar (&sl, (char) strlen (pl->ob->name));
1242 strcpy ((char *) sl.buf + sl.len, pl->ob->name);
1243 sl.len += strlen (pl->ob->name);
1244 1214
1245 Send_With_Handling (&pl->socket, &sl); 1215 Send_With_Handling (&pl->socket, &sl);
1246 free (sl.buf);
1247 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1216 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1248} 1217}
1249
1250 1218
1251/** 1219/**
1252 * Need to send an animation sequence to the client. 1220 * Need to send an animation sequence to the client.
1253 * We will send appropriate face commands to the client if we haven't 1221 * We will send appropriate face commands to the client if we haven't
1254 * sent them the face yet (this can become quite costly in terms of 1222 * sent them the face yet (this can become quite costly in terms of
… …
1256 * when the player logs in and picks stuff up. 1224 * when the player logs in and picks stuff up.
1257 */ 1225 */
1258void 1226void
1259esrv_send_animation (NewSocket * ns, short anim_num) 1227esrv_send_animation (NewSocket * ns, short anim_num)
1260{ 1228{
1261 SockList sl;
1262 int i; 1229 int i;
1263 1230
1264 /* Do some checking on the anim_num we got. Note that the animations 1231 /* Do some checking on the anim_num we got. Note that the animations
1265 * are added in contigous order, so if the number is in the valid 1232 * are added in contigous order, so if the number is in the valid
1266 * range, it must be a valid animation. 1233 * range, it must be a valid animation.
… …
1269 { 1236 {
1270 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1237 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1271 return; 1238 return;
1272 } 1239 }
1273 1240
1274 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1241 packet sl;
1275 strcpy ((char *) sl.buf, "anim "); 1242
1276 sl.len = 5; 1243 sl << "anim "
1277 SockList_AddShort (&sl, anim_num); 1244 << uint16 (anim_num)
1278 SockList_AddShort (&sl, 0); /* flags - not used right now */ 1245 << uint16 (0); /* flags - not used right now */
1246
1279 /* Build up the list of faces. Also, send any information (ie, the 1247 /* Build up the list of faces. Also, send any information (ie, the
1280 * the face itself) down to the client. 1248 * the face itself) down to the client.
1281 */ 1249 */
1282 for (i = 0; i < animations[anim_num].num_animations; i++) 1250 for (i = 0; i < animations[anim_num].num_animations; i++)
1283 { 1251 {
1284 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1252 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1285 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1253 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1286 SockList_AddShort (&sl, animations[anim_num].faces[i]); /* flags - not used right now */ 1254 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1287 } 1255 }
1256
1288 Send_With_Handling (ns, &sl); 1257 Send_With_Handling (ns, &sl);
1289 free (sl.buf); 1258
1290 ns->anims_sent[anim_num] = 1; 1259 ns->anims_sent[anim_num] = 1;
1291} 1260}
1292 1261
1293 1262
1294/****************************************************************************** 1263/******************************************************************************
… …
1308 { 1277 {
1309 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1278 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1310 return; 1279 return;
1311 abort (); 1280 abort ();
1312 } 1281 }
1282
1313 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1283 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1314 newmap->cells[x][y].count++; 1284 newmap->cells[x][y].count++;
1285
1315 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1286 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1316 esrv_send_face (ns, face_num, 0); 1287 esrv_send_face (ns, face_num, 0);
1317} 1288}
1318 1289
1319struct LayerCell 1290struct LayerCell
… …
1426static void 1397static void
1427esrv_map_doneredraw (NewSocket * ns, struct Map *newmap) 1398esrv_map_doneredraw (NewSocket * ns, struct Map *newmap)
1428{ 1399{
1429 static long frames, bytes, tbytes, tframes; 1400 static long frames, bytes, tbytes, tframes;
1430 char *cur; 1401 char *cur;
1431 SockList sl;
1432 1402
1433 1403 packet sl;
1434 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1404 sl << "map ";
1435 strcpy ((char *) sl.buf, "map ");
1436 sl.len = strlen ((char *) sl.buf);
1437 1405
1438 cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap); 1406 cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap);
1439 sl.len = cur - (char *) sl.buf; 1407 sl.len = cur - (char *) sl.buf;
1440 1408
1441/* LOG(llevDebug, "Sending map command.\n");*/ 1409/* LOG(llevDebug, "Sending map command.\n");*/
… …
1453 memcpy (&ns->lastmap, newmap, sizeof (struct Map)); 1421 memcpy (&ns->lastmap, newmap, sizeof (struct Map));
1454 Send_With_Handling (ns, &sl); 1422 Send_With_Handling (ns, &sl);
1455 ns->sent_scroll = 0; 1423 ns->sent_scroll = 0;
1456 } 1424 }
1457 1425
1458 free (sl.buf);
1459} 1426}
1460 1427
1461 1428
1462/** Clears a map cell */ 1429/** Clears a map cell */
1463static void 1430static void
1464map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1431map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1465{ 1432{
1466 cell->faces[0] = face0; 1433 cell->faces[0] = face0;
1467 cell->faces[1] = face1; 1434 cell->faces[1] = face1;
1468 cell->faces[2] = face2; 1435 cell->faces[2] = face2;
1469 cell->count = count; 1436 cell->count = count;
1470 cell->stat_hp = 0; 1437 cell->stat_hp = 0;
1438 cell->flags = 0;
1471 cell->player = 0; 1439 cell->player = 0;
1472} 1440}
1473 1441
1474#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) 1442#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1475#define MAX_LAYERS 3 1443#define MAX_LAYERS 3
1476 1444
… …
1504 * needs to get sent - if so, it adds the data, sending the head 1472 * needs to get sent - if so, it adds the data, sending the head
1505 * if needed, and returning 1. If this no data needs to get 1473 * if needed, and returning 1. If this no data needs to get
1506 * sent, it returns zero. 1474 * sent, it returns zero.
1507 */ 1475 */
1508static int 1476static int
1509check_head (SockList & sl, NewSocket & ns, int ax, int ay, int layer) 1477check_head (packet &sl, NewSocket &ns, int ax, int ay, int layer)
1510{ 1478{
1511 short face_num; 1479 short face_num;
1512 1480
1513 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1481 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1514 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1482 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1515 else 1483 else
1516 face_num = 0; 1484 face_num = 0;
1517 1485
1518 if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) 1486 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1519 { 1487 {
1520 SockList_AddShort (&sl, face_num); 1488 sl << uint16 (face_num);
1521 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1489 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1522 esrv_send_face (&ns, face_num, 0); 1490 esrv_send_face (&ns, face_num, 0);
1491
1523 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; 1492 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1524 ns.lastmap.cells[ax][ay].faces[layer] = face_num; 1493 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1525 return 1; 1494 return 1;
1526 } 1495 }
1527 1496
… …
1547 * the case, it seems to make more sense to have these layer values 1516 * the case, it seems to make more sense to have these layer values
1548 * actually match. 1517 * actually match.
1549 */ 1518 */
1550 1519
1551static int 1520static int
1552update_space (SockList * sl, NewSocket * ns, mapstruct *mp, int mx, int my, int sx, int sy, int layer) 1521update_space (packet &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1553{ 1522{
1554 object *ob, *head; 1523 object *ob, *head;
1555 uint16 face_num; 1524 uint16 face_num;
1556 int bx, by, i; 1525 int bx, by, i;
1557 1526
1558 /* If there is a multipart object stored away, treat that as more important. 1527 /* If there is a multipart object stored away, treat that as more important.
1559 * If not, then do the normal processing. 1528 * If not, then do the normal processing.
1560 */ 1529 */
1561
1562 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; 1530 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1563 1531
1564 /* Check to see if this head is part of the set of objects 1532 /* Check to see if this head is part of the set of objects
1565 * we would normally send for this space. If so, then 1533 * we would normally send for this space. If so, then
1566 * don't use the head value. We need to do the check 1534 * don't use the head value. We need to do the check
… …
1731 1699
1732 /* Another hack - because of heads and whatnot, this face may match one 1700 /* Another hack - because of heads and whatnot, this face may match one
1733 * we already sent for a lower layer. In that case, don't send 1701 * we already sent for a lower layer. In that case, don't send
1734 * this one. 1702 * this one.
1735 */ 1703 */
1736 if (face_num && layer + 1 < MAP_LAYERS && ns->lastmap.cells[sx][sy].faces[layer + 1] == face_num) 1704 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1737 {
1738 face_num = 0; 1705 face_num = 0;
1739 }
1740 1706
1741 /* We've gotten what face we want to use for the object. Now see if 1707 /* We've gotten what face we want to use for the object. Now see if
1742 * if it has changed since we last sent it to the client. 1708 * if it has changed since we last sent it to the client.
1743 */ 1709 */
1744 if (ns->lastmap.cells[sx][sy].faces[layer] != face_num) 1710 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
1745 { 1711 {
1746 ns->lastmap.cells[sx][sy].faces[layer] = face_num; 1712 ns.lastmap.cells[sx][sy].faces[layer] = face_num;
1747 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1713 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1748 esrv_send_face (ns, face_num, 0); 1714 esrv_send_face (&ns, face_num, 0);
1749 SockList_AddShort (sl, face_num); 1715
1716 sl << uint16 (face_num);
1750 return 1; 1717 return 1;
1751 } 1718 }
1719
1752 /* Nothing changed */ 1720 /* Nothing changed */
1753 return 0; 1721 return 0;
1754} 1722}
1755 1723
1756/** 1724/**
… …
1771 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1739 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1772 * take. 1740 * take.
1773 */ 1741 */
1774 1742
1775static inline int 1743static inline int
1776update_smooth (SockList * sl, NewSocket * ns, mapstruct *mp, int mx, int my, int sx, int sy, int layer) 1744update_smooth (packet &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1777{ 1745{
1778 object *ob; 1746 object *ob;
1779 int smoothlevel; /* old face_num; */ 1747 int smoothlevel; /* old face_num; */
1780 1748
1781 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1749 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1786 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1754 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1787 smoothlevel = 0; 1755 smoothlevel = 0;
1788 else 1756 else
1789 { 1757 {
1790 smoothlevel = ob->smoothlevel; 1758 smoothlevel = ob->smoothlevel;
1791 if (smoothlevel && !(ns->faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1759 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1792 SendSmooth (ns, ob->face->number); 1760 SendSmooth (&ns, ob->face->number);
1793 } /* else not already head object or blank face */ 1761 } /* else not already head object or blank face */
1794 1762
1795 /* We've gotten what face we want to use for the object. Now see if 1763 /* We've gotten what face we want to use for the object. Now see if
1796 * if it has changed since we last sent it to the client. 1764 * if it has changed since we last sent it to the client.
1797 */ 1765 */
1798 if (smoothlevel > 255) 1766 if (smoothlevel > 255)
1799 smoothlevel = 255; 1767 smoothlevel = 255;
1800 else if (smoothlevel < 0) 1768 else if (smoothlevel < 0)
1801 smoothlevel = 0; 1769 smoothlevel = 0;
1770
1802 if (ns->lastmap.cells[sx][sy].smooth[layer] != smoothlevel) 1771 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1803 { 1772 {
1804 ns->lastmap.cells[sx][sy].smooth[layer] = smoothlevel; 1773 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1805 SockList_AddChar (sl, (uint8) (smoothlevel & 0xFF)); 1774 sl << uint8 (smoothlevel);
1806 return 1; 1775 return 1;
1807 } 1776 }
1777
1808 /* Nothing changed */ 1778 /* Nothing changed */
1809 return 0; 1779 return 0;
1810} 1780}
1811 1781
1812/** 1782/**
… …
1853draw_client_map1 (object *pl) 1823draw_client_map1 (object *pl)
1854{ 1824{
1855 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1825 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;
1856 sint16 nx, ny; 1826 sint16 nx, ny;
1857 int estartlen, eoldlen; 1827 int estartlen, eoldlen;
1858 SockList sl;
1859 SockList esl; /*For extended Map info */
1860 uint16 mask, emask; 1828 uint16 mask, emask;
1861 uint8 eentrysize; 1829 uint8 eentrysize;
1862 uint16 ewhatstart, ewhatflag; 1830 uint16 ewhatstart, ewhatflag;
1863 uint8 extendedinfos; 1831 uint8 extendedinfos;
1864 mapstruct *m; 1832 maptile *m;
1865 1833
1866 NewSocket & socket = pl->contr->socket; 1834 NewSocket &socket = pl->contr->socket;
1867 1835
1868 check_map_change (pl->contr); 1836 check_map_change (pl->contr);
1869 1837
1870 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1838 packet sl;
1871 if (socket.mapmode == Map1Cmd) 1839 packet esl;
1872 strcpy ((char *) sl.buf, "map1 "); 1840
1873 else 1841 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1874 strcpy ((char *) sl.buf, "map1a ");
1875 sl.len = strlen ((char *) sl.buf);
1876 startlen = sl.len; 1842 startlen = sl.len;
1843
1877 /*Extendedmapinfo structure initialisation */ 1844 /*Extendedmapinfo structure initialisation */
1878 if (socket.ext_mapinfos) 1845 if (socket.ext_mapinfos)
1879 { 1846 {
1880 esl.buf = (unsigned char *) malloc (MAXSOCKBUF);
1881 strcpy ((char *) esl.buf, "mapextended ");
1882 esl.len = strlen ((char *) esl.buf);
1883 extendedinfos = EMI_NOREDRAW; 1847 extendedinfos = EMI_NOREDRAW;
1848
1884 if (socket.EMI_smooth) 1849 if (socket.EMI_smooth)
1885 extendedinfos |= EMI_SMOOTH; 1850 extendedinfos |= EMI_SMOOTH;
1851
1886 ewhatstart = esl.len; 1852 ewhatstart = esl.len;
1887 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1853 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1888 could need to be taken away */ 1854 could need to be taken away */
1889 SockList_AddChar (&esl, extendedinfos);
1890 eentrysize = getExtendedMapInfoSize (&socket); 1855 eentrysize = getExtendedMapInfoSize (&socket);
1891 SockList_AddChar (&esl, eentrysize); 1856 esl << "mapextended "
1857 << uint8 (extendedinfos)
1858 << uint8 (eentrysize);
1892 estartlen = esl.len; 1859 estartlen = esl.len;
1893 } 1860 }
1894 else 1861 else
1895 { 1862 {
1896 /* suppress compiler warnings */ 1863 /* suppress compiler warnings */
1897 ewhatstart = 0; 1864 ewhatstart = 0;
1898 ewhatflag = 0; 1865 ewhatflag = 0;
1899 estartlen = 0; 1866 estartlen = 0;
1900 } 1867 }
1868
1901 /* Init data to zero */ 1869 /* Init data to zero */
1902 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS); 1870 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1903 1871
1904 /* x,y are the real map locations. ax, ay are viewport relative 1872 /* x,y are the real map locations. ax, ay are viewport relative
1905 * locations. 1873 * locations.
… …
1909 /* We could do this logic as conditionals in the if statement, 1877 /* We could do this logic as conditionals in the if statement,
1910 * but that started to get a bit messy to look at. 1878 * but that started to get a bit messy to look at.
1911 */ 1879 */
1912 max_x = pl->x + (socket.mapx + 1) / 2; 1880 max_x = pl->x + (socket.mapx + 1) / 2;
1913 max_y = pl->y + (socket.mapy + 1) / 2; 1881 max_y = pl->y + (socket.mapy + 1) / 2;
1882
1914 if (socket.mapmode == Map1aCmd) 1883 if (socket.mapmode == Map1aCmd)
1915 { 1884 {
1916 max_x += MAX_HEAD_OFFSET; 1885 max_x += MAX_HEAD_OFFSET;
1917 max_y += MAX_HEAD_OFFSET; 1886 max_y += MAX_HEAD_OFFSET;
1918 } 1887 }
… …
1935 { 1904 {
1936 int i, got_one; 1905 int i, got_one;
1937 1906
1938 oldlen = sl.len; 1907 oldlen = sl.len;
1939 1908
1940 SockList_AddShort (&sl, mask); 1909 sl << uint16 (mask);
1941 1910
1942 if (check_head (sl, socket, ax, ay, 2)) 1911 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1943 mask |= 0x4;
1944 if (check_head (sl, socket, ax, ay, 1)) 1912 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1945 mask |= 0x2;
1946 if (check_head (sl, socket, ax, ay, 0)) 1913 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1947 mask |= 0x1;
1948 1914
1949 /* If all we are doing is sending 0 (blank) faces, we don't 1915 /* If all we are doing is sending 0 (blank) faces, we don't
1950 * actually need to send that - just the coordinates 1916 * actually need to send that - just the coordinates
1951 * with no faces tells the client to blank out the 1917 * with no faces tells the client to blank out the
1952 * space. 1918 * space.
1953 */ 1919 */
1954 got_one = 0; 1920 got_one = 0;
1955 for (i = oldlen + 2; i < sl.len; i++) 1921 for (i = oldlen + 2; i < sl.len; i++)
1956 {
1957 if (sl.buf[i]) 1922 if (sl.buf[i])
1958 got_one = 1; 1923 got_one = 1;
1959 }
1960 1924
1961 if (got_one && (mask & 0xf)) 1925 if (got_one && (mask & 0xf))
1962 {
1963 sl.buf[oldlen + 1] = mask & 0xff; 1926 sl.buf[oldlen + 1] = mask & 0xff;
1964 }
1965 else 1927 else
1966 { /*either all faces blank, either no face at all */ 1928 { /*either all faces blank, either no face at all */
1967 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ 1929 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1968 sl.len = oldlen + 2; 1930 sl.len = oldlen + 2;
1969 else 1931 else
1970 sl.len = oldlen; 1932 sl.len = oldlen;
1971 } 1933 }
1934
1972 /*What concerns extendinfos, nothing to be done for now 1935 /*What concerns extendinfos, nothing to be done for now
1973 * (perhaps effects layer later) 1936 * (perhaps effects layer later)
1974 */ 1937 */
1975 continue; /* don't do processing below */ 1938 continue; /* don't do processing below */
1976 } 1939 }
1977 1940
1978 MapCell & lastcell = socket.lastmap.cells[ax][ay]; 1941 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1979 1942
1980 d = pl->contr->blocked_los[ax][ay]; 1943 d = pl->contr->blocked_los[ax][ay];
1981 1944
1982 /* If the coordinates are not valid, or it is too dark to see, 1945 /* If the coordinates are not valid, or it is too dark to see,
1983 * we tell the client as such 1946 * we tell the client as such
1984 */ 1947 */
1985 nx = x; 1948 nx = x;
1986 ny = y; 1949 ny = y;
1987 m = get_map_from_coord (pl->map, &nx, &ny); 1950 m = get_map_from_coord (pl->map, &nx, &ny);
1951
1988 if (!m) 1952 if (!m)
1989 { 1953 {
1990 /* space is out of map. Update space and clear values 1954 /* space is out of map. Update space and clear values
1991 * if this hasn't already been done. If the space is out 1955 * if this hasn't already been done. If the space is out
1992 * of the map, it shouldn't have a head 1956 * of the map, it shouldn't have a head
1993 */ 1957 */
1994 if (lastcell.count != -1) 1958 if (lastcell.count != -1)
1995 { 1959 {
1996 SockList_AddShort (&sl, mask); 1960 sl << uint16 (mask);
1997 map_clearcell (&lastcell, 0, 0, 0, -1); 1961 map_clearcell (&lastcell, 0, 0, 0, -1);
1998 } 1962 }
1999 } 1963 }
2000 else if (d > 3) 1964 else if (d > 3)
2001 { 1965 {
… …
2005 * reason. Still may need to send the head for this space. 1969 * reason. Still may need to send the head for this space.
2006 */ 1970 */
2007 1971
2008 oldlen = sl.len; 1972 oldlen = sl.len;
2009 1973
2010 SockList_AddShort (&sl, mask); 1974 sl << uint16 (mask);
1975
2011 if (lastcell.count != -1) 1976 if (lastcell.count != -1)
2012 need_send = 1; 1977 need_send = 1;
1978
2013 count = -1; 1979 count = -1;
2014 1980
2015 if (socket.mapmode == Map1aCmd && have_head (ax, ay)) 1981 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
2016 { 1982 {
2017 /* Now check to see if any heads need to be sent */ 1983 /* Now check to see if any heads need to be sent */
2018 1984
2019 if (check_head (sl, socket, ax, ay, 2)) 1985 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
2020 mask |= 0x4;
2021 if (check_head (sl, socket, ax, ay, 1)) 1986 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
2022 mask |= 0x2;
2023 if (check_head (sl, socket, ax, ay, 0)) 1987 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
2024 mask |= 0x1;
2025 1988
2026 lastcell.count = count; 1989 lastcell.count = count;
2027
2028 } 1990 }
2029 else 1991 else
2030 { 1992 {
2031 struct MapCell *cell = &lastcell;
2032
2033 /* properly clear a previously sent big face */ 1993 /* properly clear a previously sent big face */
2034 if (cell->faces[0] != 0 || cell->faces[1] != 0 || cell->faces[2] != 0) 1994 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0
1995 || lastcell.stat_hp || lastcell.flags || lastcell.player)
2035 need_send = 1; 1996 need_send = 1;
1997
2036 map_clearcell (&lastcell, 0, 0, 0, count); 1998 map_clearcell (&lastcell, 0, 0, 0, count);
2037 } 1999 }
2038 2000
2039 if ((mask & 0xf) || need_send) 2001 if ((mask & 0xf) || need_send)
2040 {
2041 sl.buf[oldlen + 1] = mask & 0xff; 2002 sl.buf[oldlen + 1] = mask & 0xff;
2042 }
2043 else 2003 else
2044 {
2045 sl.len = oldlen; 2004 sl.len = oldlen;
2046 }
2047 } 2005 }
2048 else 2006 else
2049 { 2007 {
2050 /* In this block, the space is visible or there are head objects 2008 /* In this block, the space is visible or there are head objects
2051 * we need to send. 2009 * we need to send.
… …
2063 */ 2021 */
2064 oldlen = sl.len; 2022 oldlen = sl.len;
2065 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 2023 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2066 eoldlen = esl.len; 2024 eoldlen = esl.len;
2067 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 2025 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2068 SockList_AddShort (&sl, mask); 2026 sl << uint16 (mask);
2069 2027
2070 if (socket.ext_mapinfos) 2028 if (socket.ext_mapinfos)
2071 SockList_AddShort (&esl, emask); 2029 esl << uint16 (emask);
2072 2030
2073 unsigned char dummy; 2031 unsigned char dummy;
2074 unsigned char *last_ext = &dummy; 2032 unsigned char *last_ext = &dummy;
2075 2033
2076 /* Darkness changed */ 2034 /* Darkness changed */
… …
2080 2038
2081 if (socket.extmap) 2039 if (socket.extmap)
2082 { 2040 {
2083 *last_ext |= 0x80; 2041 *last_ext |= 0x80;
2084 last_ext = sl.buf + sl.len; 2042 last_ext = sl.buf + sl.len;
2085 SockList_AddChar (&sl, d); 2043 sl << uint8 (d);
2086 } 2044 }
2087 else 2045 else
2088 SockList_AddChar (&sl, 255 - 64 * d); 2046 sl << uint8 (255 - 64 * d);
2089 } 2047 }
2090 2048
2091 lastcell.count = d; 2049 lastcell.count = d;
2092 2050
2093 if (socket.extmap) 2051 if (socket.extmap)
2094 { 2052 {
2095 uint8 stat_hp = 0; 2053 uint8 stat_hp = 0;
2096 uint8 stat_width = 0; 2054 uint8 stat_width = 0;
2055 uint8 flags = 0;
2097 tag_t player = 0; 2056 UUID player = 0;
2098 2057
2099 // send hp information, if applicable 2058 // send hp information, if applicable
2100 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 2059 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))
2101 { 2060 {
2102 if (op->head || op->invisible) 2061 if (op->head || op->invisible)
… …
2109 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 2068 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
2110 stat_width = op->arch->tail_x; 2069 stat_width = op->arch->tail_x;
2111 } 2070 }
2112 } 2071 }
2113 2072
2073 if (op->msg && op->msg[0] == '@')
2074 flags |= 1;
2075
2114 if (op->type == PLAYER && op != pl) 2076 if (op->type == PLAYER && op != pl)
2115 player = op->count; 2077 player = op->count;
2116 } 2078 }
2117 2079
2118 if (lastcell.stat_hp != stat_hp) 2080 if (lastcell.stat_hp != stat_hp)
… …
2120 lastcell.stat_hp = stat_hp; 2082 lastcell.stat_hp = stat_hp;
2121 2083
2122 mask |= 0x8; 2084 mask |= 0x8;
2123 *last_ext |= 0x80; 2085 *last_ext |= 0x80;
2124 last_ext = sl.buf + sl.len; 2086 last_ext = sl.buf + sl.len;
2125 SockList_AddChar (&sl, 5); 2087
2126 SockList_AddChar (&sl, stat_hp); 2088 sl << uint8 (5) << uint8 (stat_hp);
2127 2089
2128 if (stat_width > 1) 2090 if (stat_width > 1)
2129 { 2091 {
2130 *last_ext |= 0x80; 2092 *last_ext |= 0x80;
2131 last_ext = sl.buf + sl.len; 2093 last_ext = sl.buf + sl.len;
2132 SockList_AddChar (&sl, 6); 2094
2133 SockList_AddChar (&sl, stat_width); 2095 sl << uint8 (6) << uint8 (stat_width);
2134 } 2096 }
2135 } 2097 }
2136 2098
2137 if (lastcell.player !=player) 2099 if (lastcell.player != player)
2138 { 2100 {
2139 lastcell.player = player; 2101 lastcell.player = player;
2140 2102
2141 mask |= 0x8; 2103 mask |= 0x8;
2142 *last_ext |= 0x80; 2104 *last_ext |= 0x80;
2143 last_ext = sl.buf + sl.len; 2105 last_ext = sl.buf + sl.len;
2144 SockList_AddChar (&sl, 0x47); 2106
2145 SockList_AddChar (&sl, 4); 2107 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2146 SockList_AddInt (&sl, player); 2108 }
2109
2110 if (lastcell.flags != flags)
2111 {
2112 lastcell.flags = flags;
2113
2114 mask |= 0x8;
2115 *last_ext |= 0x80;
2116 last_ext = sl.buf + sl.len;
2117
2118 sl << uint8 (8) << uint8 (flags);
2147 } 2119 }
2148 } 2120 }
2149 2121
2150 /* Floor face */ 2122 /* Floor face */
2151 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 2)) 2123 if (update_space (sl, socket, m, nx, ny, ax, ay, 2))
2152 mask |= 0x4; 2124 mask |= 0x4;
2153 2125
2154 if (socket.EMI_smooth) 2126 if (socket.EMI_smooth)
2155 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 2)) 2127 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
2156 emask |= 0x4; 2128 emask |= 0x4;
2157 2129
2158 /* Middle face */ 2130 /* Middle face */
2159 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 1)) 2131 if (update_space (sl, socket, m, nx, ny, ax, ay, 1))
2160 mask |= 0x2; 2132 mask |= 0x2;
2161 2133
2162 if (socket.EMI_smooth) 2134 if (socket.EMI_smooth)
2163 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 1)) 2135 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
2164 emask |= 0x2; 2136 emask |= 0x2;
2165 2137
2166 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) 2138 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
2167 { 2139 {
2168 if (lastcell.faces[0] != pl->face->number) 2140 if (lastcell.faces[0] != pl->face->number)
2169 { 2141 {
2170 lastcell.faces[0] = pl->face->number; 2142 lastcell.faces[0] = pl->face->number;
2171 mask |= 0x1; 2143 mask |= 0x1;
2144
2172 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 2145 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
2173 esrv_send_face (&socket, pl->face->number, 0); 2146 esrv_send_face (&socket, pl->face->number, 0);
2174 SockList_AddShort (&sl, pl->face->number); 2147
2148 sl << uint16 (pl->face->number);
2175 } 2149 }
2176 } 2150 }
2177 /* Top face */
2178 else 2151 else
2179 { 2152 {
2153 /* Top face */
2180 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 0)) 2154 if (update_space (sl, socket, m, nx, ny, ax, ay, 0))
2181 mask |= 0x1; 2155 mask |= 0x1;
2156
2182 if (socket.EMI_smooth) 2157 if (socket.EMI_smooth)
2183 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 0)) 2158 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
2184 {
2185 emask |= 0x1; 2159 emask |= 0x1;
2186 }
2187 } 2160 }
2161
2188 /* Check to see if we are in fact sending anything for this 2162 /* Check to see if we are in fact sending anything for this
2189 * space by checking the mask. If so, update the mask. 2163 * space by checking the mask. If so, update the mask.
2190 * if not, reset the len to that from before adding the mask 2164 * if not, reset the len to that from before adding the mask
2191 * value, so we don't send those bits. 2165 * value, so we don't send those bits.
2192 */ 2166 */
2193 if (mask & 0xf) 2167 if (mask & 0xf)
2194 {
2195 sl.buf[oldlen + 1] = mask & 0xff; 2168 sl.buf[oldlen + 1] = mask & 0xff;
2196 }
2197 else 2169 else
2198 {
2199 sl.len = oldlen; 2170 sl.len = oldlen;
2200 } 2171
2201 if (emask & 0xf) 2172 if (emask & 0xf)
2202 {
2203 esl.buf[eoldlen + 1] = emask & 0xff; 2173 esl.buf[eoldlen + 1] = emask & 0xff;
2204 }
2205 else 2174 else
2206 {
2207 esl.len = eoldlen; 2175 esl.len = eoldlen;
2208 }
2209 } /* else this is a viewable space */ 2176 } /* else this is a viewable space */
2210 } /* for x loop */ 2177 } /* for x loop */
2211 } /* for y loop */ 2178 } /* for y loop */
2212 2179
2213 /* Verify that we in fact do need to send this */ 2180 /* Verify that we in fact do need to send this */
… …
2222 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 2189 esl.buf[ewhatstart + 1] = ewhatflag & 0xff;
2223 } 2190 }
2224 2191
2225 if (esl.len > estartlen) 2192 if (esl.len > estartlen)
2226 Send_With_Handling (&socket, &esl); 2193 Send_With_Handling (&socket, &esl);
2227
2228 free (esl.buf);
2229 } 2194 }
2230 2195
2231 if (sl.len > startlen || socket.sent_scroll) 2196 if (sl.len > startlen || socket.sent_scroll)
2232 { 2197 {
2233 Send_With_Handling (&socket, &sl); 2198 Send_With_Handling (&socket, &sl);
2234 socket.sent_scroll = 0; 2199 socket.sent_scroll = 0;
2235 } 2200 }
2236
2237 free (sl.buf);
2238} 2201}
2239 2202
2240/** 2203/**
2241 * Draws client map. 2204 * Draws client map.
2242 */ 2205 */
… …
2247 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 2210 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
2248 New_Face *face, *floor; 2211 New_Face *face, *floor;
2249 New_Face *floor2; 2212 New_Face *floor2;
2250 int d, mflags; 2213 int d, mflags;
2251 struct Map newmap; 2214 struct Map newmap;
2252 mapstruct *m, *pm; 2215 maptile *m, *pm;
2253 2216
2254 if (pl->type != PLAYER) 2217 if (pl->type != PLAYER)
2255 { 2218 {
2256 LOG (llevError, "draw_client_map called with non player/non eric-server\n"); 2219 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
2257 return; 2220 return;
… …
2356 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap); 2319 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap);
2357 } 2320 }
2358 } /* Is a valid space */ 2321 } /* Is a valid space */
2359 } 2322 }
2360 } 2323 }
2324
2361 esrv_map_doneredraw (&pl->contr->socket, &newmap); 2325 esrv_map_doneredraw (&pl->contr->socket, &newmap);
2362 2326
2363 check_map_change (pl->contr); 2327 check_map_change (pl->contr);
2364} 2328}
2365 2329
… …
2374 2338
2375/*****************************************************************************/ 2339/*****************************************************************************/
2376void 2340void
2377send_plugin_custom_message (object *pl, char *buf) 2341send_plugin_custom_message (object *pl, char *buf)
2378{ 2342{
2379 cs_write_string (&pl->contr->socket, buf, strlen (buf)); 2343 pl->contr->socket.send_packet (buf);
2380} 2344}
2381 2345
2382/** 2346/**
2383 * This sends the skill number to name mapping. We ignore 2347 * This sends the skill number to name mapping. We ignore
2384 * the params - we always send the same info no matter what. 2348 * the params - we always send the same info no matter what.
2385 */ 2349 */
2386void 2350void
2387send_skill_info (NewSocket * ns, char *params) 2351send_skill_info (NewSocket *ns, char *params)
2388{ 2352{
2389 SockList sl; 2353 packet sl;
2390 int i; 2354 sl << "replyinfo skill_info\n";
2391 2355
2392 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
2393 strcpy ((char *) sl.buf, "replyinfo skill_info\n");
2394 for (i = 1; i < NUM_SKILLS; i++) 2356 for (int i = 1; i < NUM_SKILLS; i++)
2395 { 2357 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2396 sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 2358
2397 }
2398 sl.len = strlen ((char *) sl.buf);
2399 if (sl.len >= MAXSOCKBUF) 2359 if (sl.len >= MAXSOCKBUF)
2400 { 2360 {
2401 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2361 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2402 fatal (0); 2362 fatal (0);
2403 } 2363 }
2364
2404 Send_With_Handling (ns, &sl); 2365 Send_With_Handling (ns, &sl);
2405 free (sl.buf);
2406} 2366}
2407 2367
2408/** 2368/**
2409 * This sends the spell path to name mapping. We ignore 2369 * This sends the spell path to name mapping. We ignore
2410 * the params - we always send the same info no matter what. 2370 * the params - we always send the same info no matter what.
2411 */ 2371 */
2412void 2372void
2413send_spell_paths (NewSocket * ns, char *params) 2373send_spell_paths (NewSocket * ns, char *params)
2414{ 2374{
2415 SockList sl; 2375 packet sl;
2416 int i;
2417 2376
2418 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2377 sl << "replyinfo spell_paths\n";
2419 strcpy ((char *) sl.buf, "replyinfo spell_paths\n"); 2378
2420 for (i = 0; i < NRSPELLPATHS; i++) 2379 for (int i = 0; i < NRSPELLPATHS; i++)
2421 sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", 1 << i, spellpathnames[i]); 2380 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2422 sl.len = strlen ((char *) sl.buf); 2381
2423 if (sl.len >= MAXSOCKBUF) 2382 if (sl.len >= MAXSOCKBUF)
2424 { 2383 {
2425 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2384 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2426 fatal (0); 2385 fatal (0);
2427 } 2386 }
2387
2428 Send_With_Handling (ns, &sl); 2388 Send_With_Handling (ns, &sl);
2429 free (sl.buf);
2430} 2389}
2431 2390
2432/** 2391/**
2433 * This looks for any spells the player may have that have changed their stats. 2392 * This looks for any spells the player may have that have changed their stats.
2434 * it then sends an updspell packet for each spell that has changed in this way 2393 * it then sends an updspell packet for each spell that has changed in this way
2435 */ 2394 */
2436void 2395void
2437esrv_update_spells (player *pl) 2396esrv_update_spells (player *pl)
2438{ 2397{
2439 SockList sl;
2440 int flags = 0;
2441 object *spell;
2442
2443 if (!pl->socket.monitor_spells) 2398 if (!pl->socket.monitor_spells)
2444 return; 2399 return;
2400
2445 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2401 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2446 { 2402 {
2447 if (spell->type == SPELL) 2403 if (spell->type == SPELL)
2448 { 2404 {
2405 int flags = 0;
2406
2449 /* check if we need to update it */ 2407 /* check if we need to update it */
2450 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 2408 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
2451 { 2409 {
2452 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 2410 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2453 flags |= UPD_SP_MANA; 2411 flags |= UPD_SP_MANA;
2454 } 2412 }
2413
2455 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 2414 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
2456 { 2415 {
2457 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 2416 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2458 flags |= UPD_SP_GRACE; 2417 flags |= UPD_SP_GRACE;
2459 } 2418 }
2419
2460 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 2420 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
2461 { 2421 {
2462 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 2422 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2463 flags |= UPD_SP_DAMAGE; 2423 flags |= UPD_SP_DAMAGE;
2464 } 2424 }
2425
2465 if (flags != 0) 2426 if (flags)
2466 { 2427 {
2467 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2428 packet sl;
2468 strcpy ((char *) sl.buf, "updspell "); 2429
2469 sl.len = strlen ((char *) sl.buf); 2430 sl << "updspell "
2470 SockList_AddChar (&sl, flags); 2431 << uint8 (flags)
2471 SockList_AddInt (&sl, spell->count); 2432 << uint32 (spell->count);
2472 if (flags & UPD_SP_MANA) 2433
2473 SockList_AddShort (&sl, spell->last_sp); 2434 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2474 if (flags & UPD_SP_GRACE) 2435 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2475 SockList_AddShort (&sl, spell->last_grace); 2436 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2476 if (flags & UPD_SP_DAMAGE) 2437
2477 SockList_AddShort (&sl, spell->last_eat);
2478 flags = 0;
2479 Send_With_Handling (&pl->socket, &sl); 2438 Send_With_Handling (&pl->socket, &sl);
2480 free (sl.buf);
2481 } 2439 }
2482 } 2440 }
2483 } 2441 }
2484} 2442}
2485 2443
2486void 2444void
2487esrv_remove_spell (player *pl, object *spell) 2445esrv_remove_spell (player *pl, object *spell)
2488{ 2446{
2489 SockList sl;
2490
2491 if (!pl->socket.monitor_spells) 2447 if (!pl->socket.monitor_spells)
2492 return; 2448 return;
2449
2493 if (!pl || !spell || spell->env != pl->ob) 2450 if (!pl || !spell || spell->env != pl->ob)
2494 { 2451 {
2495 LOG (llevError, "Invalid call to esrv_remove_spell"); 2452 LOG (llevError, "Invalid call to esrv_remove_spell");
2496 return; 2453 return;
2497 } 2454 }
2498 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2455
2499 strcpy ((char *) sl.buf, "delspell "); 2456 packet sl;
2500 sl.len = strlen ((char *) sl.buf); 2457
2501 SockList_AddInt (&sl, spell->count); 2458 sl << "delspell "
2459 << uint32 (spell->count);
2460
2502 Send_With_Handling (&pl->socket, &sl); 2461 Send_With_Handling (&pl->socket, &sl);
2503 free (sl.buf);
2504} 2462}
2505 2463
2506/* appends the spell *spell to the Socklist we will send the data to. */ 2464/* appends the spell *spell to the Socklist we will send the data to. */
2507static void 2465static void
2508append_spell (player *pl, SockList * sl, object *spell) 2466append_spell (player *pl, packet &sl, object *spell)
2509{ 2467{
2510 int len, i, skill = 0; 2468 int len, i, skill = 0;
2511 2469
2512 if (!(spell->name)) 2470 if (!(spell->name))
2513 { 2471 {
2514 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 2472 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2515 return; 2473 return;
2516 } 2474 }
2517 SockList_AddInt (sl, spell->count); 2475
2518 SockList_AddShort (sl, spell->level);
2519 SockList_AddShort (sl, spell->casting_time);
2520 /* store costs and damage in the object struct, to compare to later */ 2476 /* store costs and damage in the object struct, to compare to later */
2521 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 2477 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2522 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 2478 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2523 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 2479 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2524 /* send the current values */
2525 SockList_AddShort (sl, spell->last_sp);
2526 SockList_AddShort (sl, spell->last_grace);
2527 SockList_AddShort (sl, spell->last_eat);
2528 2480
2529 /* figure out which skill it uses, if it uses one */ 2481 /* figure out which skill it uses, if it uses one */
2530 if (spell->skill) 2482 if (spell->skill)
2531 { 2483 {
2532 for (i = 1; i < NUM_SKILLS; i++) 2484 for (i = 1; i < NUM_SKILLS; i++)
… …
2534 { 2486 {
2535 skill = i + CS_STAT_SKILLINFO; 2487 skill = i + CS_STAT_SKILLINFO;
2536 break; 2488 break;
2537 } 2489 }
2538 } 2490 }
2539 SockList_AddChar (sl, skill);
2540 2491
2541 SockList_AddInt (sl, spell->path_attuned); 2492 /* send the current values */
2493 sl << uint32 (spell->count)
2494 << uint16 (spell->level)
2495 << uint16 (spell->casting_time)
2496 << uint16 (spell->last_sp)
2497 << uint16 (spell->last_grace)
2498 << uint16 (spell->last_eat)
2499 << uint8 (skill)
2500 << uint32 (spell->path_attuned)
2542 SockList_AddInt (sl, (spell->face) ? spell->face->number : 0); 2501 << uint32 (spell->face ? spell->face->number : 0)
2543 2502 << data8 (spell->name)
2544 len = strlen (spell->name); 2503 << data16 (spell->msg);
2545 SockList_AddChar (sl, (char) len);
2546 memcpy (sl->buf + sl->len, spell->name, len);
2547 sl->len += len;
2548
2549 if (!spell->msg)
2550 {
2551 SockList_AddShort (sl, 0);
2552 }
2553 else
2554 {
2555 len = strlen (spell->msg);
2556 SockList_AddShort (sl, len);
2557 memcpy (sl->buf + sl->len, spell->msg, len);
2558 sl->len += len;
2559 }
2560} 2504}
2561 2505
2562/** 2506/**
2563 * This tells the client to add the spell *ob, if *ob is NULL, then add 2507 * This tells the client to add the spell *ob, if *ob is NULL, then add
2564 * all spells in the player's inventory. 2508 * all spells in the player's inventory.
2565 */ 2509 */
2566void 2510void
2567esrv_add_spells (player *pl, object *spell) 2511esrv_add_spells (player *pl, object *spell)
2568{ 2512{
2569 SockList sl;
2570
2571 if (!pl) 2513 if (!pl)
2572 { 2514 {
2573 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2515 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2574 return; 2516 return;
2575 } 2517 }
2518
2576 if (!pl->socket.monitor_spells) 2519 if (!pl->socket.monitor_spells)
2577 return; 2520 return;
2578 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2521
2579 strcpy ((char *) sl.buf, "addspell "); 2522 packet sl;
2580 sl.len = strlen ((char *) sl.buf); 2523
2524 sl << "addspell ";
2525
2581 if (!spell) 2526 if (!spell)
2582 { 2527 {
2583 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2528 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2584 { 2529 {
2585 /* were we to simply keep appending data here, we could exceed 2530 /* were we to simply keep appending data here, we could exceed
… …
2595 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 2540 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2596 * like it will fix this 2541 * like it will fix this
2597 */ 2542 */
2598 if (spell->type != SPELL) 2543 if (spell->type != SPELL)
2599 continue; 2544 continue;
2545
2600 if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2546 if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2601 { 2547 {
2602 Send_With_Handling (&pl->socket, &sl); 2548 Send_With_Handling (&pl->socket, &sl);
2603 strcpy ((char *) sl.buf, "addspell "); 2549 strcpy ((char *) sl.buf, "addspell ");
2604 sl.len = strlen ((char *) sl.buf); 2550 sl.len = strlen ((char *) sl.buf);
2605 } 2551 }
2552
2606 append_spell (pl, &sl, spell); 2553 append_spell (pl, sl, spell);
2607 } 2554 }
2608 } 2555 }
2609 else if (spell->type != SPELL) 2556 else if (spell->type != SPELL)
2610 { 2557 {
2611 LOG (llevError, "Asked to send a non-spell object as a spell"); 2558 LOG (llevError, "Asked to send a non-spell object as a spell");
2612 return; 2559 return;
2613 } 2560 }
2614 else 2561 else
2615 append_spell (pl, &sl, spell); 2562 append_spell (pl, sl, spell);
2563
2616 if (sl.len >= MAXSOCKBUF) 2564 if (sl.length () >= MAXSOCKBUF)
2617 { 2565 {
2618 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2566 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2619 fatal (0); 2567 fatal (0);
2620 } 2568 }
2569
2621 /* finally, we can send the packet */ 2570 /* finally, we can send the packet */
2622 Send_With_Handling (&pl->socket, &sl); 2571 Send_With_Handling (&pl->socket, &sl);
2623 free (sl.buf); 2572
2624} 2573}
2574

Diff Legend

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