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.21 by root, Sat Sep 16 22:24:13 2006 UTC vs.
Revision 1.33 by root, Thu Dec 14 01:21:58 2006 UTC

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

Diff Legend

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