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.31 by root, Thu Dec 14 00:23:59 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
… …
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
… …
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
… …
696 */ 682 */
697static void 683static void
698SendSmooth (NewSocket * ns, uint16 face) 684SendSmooth (NewSocket * ns, uint16 face)
699{ 685{
700 uint16 smoothface; 686 uint16 smoothface;
701 unsigned char reply[MAX_BUF];
702 SockList sl;
703 687
704 /* If we can't find a face, return and set it so we won't try to send this 688 /* If we can't find a face, return and set it so we won't try to send this
705 * again. 689 * again.
706 */ 690 */
707 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 691 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
… …
715 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 699 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
716 esrv_send_face (ns, smoothface, 0); 700 esrv_send_face (ns, smoothface, 0);
717 701
718 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 702 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
719 703
720 sl.buf = reply; 704 SockList sl (MAXSOCKBUF);
721 strcpy ((char *) sl.buf, "smooth "); 705
722 sl.len = strlen ((char *) sl.buf); 706 sl << "smooth "
723 SockList_AddShort (&sl, face); 707 << uint16 (face)
724 SockList_AddShort (&sl, smoothface); 708 << uint16 (smoothface);
709
725 Send_With_Handling (ns, &sl); 710 Send_With_Handling (ns, &sl);
711 sl.free ();
726} 712}
727 713
728 /** 714 /**
729 * Tells client the picture it has to use 715 * Tells client the picture it has to use
730 * to smooth a picture number given as argument. 716 * to smooth a picture number given as argument.
… …
736 722
737 facenbr = atoi (buf); 723 facenbr = atoi (buf);
738 SendSmooth (ns, facenbr); 724 SendSmooth (ns, facenbr);
739} 725}
740 726
741
742
743
744
745/** 727/**
746 * This handles the general commands from the client (ie, north, fire, cast, 728 * This handles the general commands from the client (ie, north, fire, cast,
747 * etc.) 729 * etc.)
748 */ 730 */
749void 731void
… …
802 */ 784 */
803void 785void
804NewPlayerCmd (uint8 * buf, int len, player *pl) 786NewPlayerCmd (uint8 * buf, int len, player *pl)
805{ 787{
806 int time, repeat; 788 int time, repeat;
789 char command[MAX_BUF];
807 short packet; 790 short packet;
808 unsigned char command[MAX_BUF];
809 SockList sl;
810 791
811 if (len < 7) 792 if (len < 7)
812 { 793 {
813 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 794 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
814 return; 795 return;
815 } 796 }
816 797
817 packet = GetShort_String (buf); 798 packet = net_uint16 (buf);
818 repeat = GetInt_String (buf + 2); 799 repeat = net_uint32 (buf + 2);
800
819 /* -1 is special - no repeat, but don't update */ 801 /* -1 is special - no repeat, but don't update */
820 if (repeat != -1) 802 if (repeat != -1)
821 {
822 pl->count = repeat; 803 pl->count = repeat;
823 } 804
824 if ((len - 4) >= MAX_BUF) 805 if ((len - 4) >= MAX_BUF)
825 len = MAX_BUF - 5; 806 len = MAX_BUF - 5;
826 807
827 strncpy ((char *) command, (char *) buf + 6, len - 4); 808 strncpy ((char *) command, (char *) buf + 6, len - 4);
828 command[len - 4] = '\0'; 809 command[len - 4] = '\0';
… …
838 return; 819 return;
839 } 820 }
840 821
841 /* This should not happen anymore. */ 822 /* This should not happen anymore. */
842 if (pl->ob->speed_left < -1.0) 823 if (pl->ob->speed_left < -1.0)
843 {
844 LOG (llevError, "Player has negative time - shouldn't do command.\n"); 824 LOG (llevError, "Player has negative time - shouldn't do command.\n");
845 } 825
846 /* In c_new.c */ 826 /* In c_new.c */
847 execute_newserver_command (pl->ob, (char *) command); 827 execute_newserver_command (pl->ob, (char *) command);
848 /* Perhaps something better should be done with a left over count. 828 /* Perhaps something better should be done with a left over count.
849 * Cleaning up the input should probably be done first - all actions 829 * 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 830 * for the command that issued the count should be done before any other
851 * commands. 831 * commands.
852 */ 832 */
853 pl->count = 0; 833 pl->count = 0;
854 834
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) 835 if (FABS (pl->ob->speed) < 0.001)
861 time = MAX_TIME * 100; 836 time = MAX_TIME * 100;
862 else 837 else
863 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 838 time = (int) (MAX_TIME / FABS (pl->ob->speed));
864 SockList_AddInt (&sl, time); 839
840 /* Send confirmation of command execution now */
841
842 SockList sl (MAXSOCKBUF);
843 sl << "comc " << uint16 (packet) << uint32 (time);
865 Send_With_Handling (&pl->socket, &sl); 844 Send_With_Handling (&pl->socket, &sl);
845 sl.free ();
866} 846}
867 847
868 848
869/** This is a reply to a previous query. */ 849/** This is a reply to a previous query. */
870void 850void
… …
982 /* these are old dxclients */ 962 /* these are old dxclients */
983 /* Version 1024 added support for singular + plural name values - 963 /* Version 1024 added support for singular + plural name values -
984 * requiing this minimal value reduces complexity of that code, and it 964 * requiing this minimal value reduces complexity of that code, and it
985 * has been around for a long time. 965 * has been around for a long time.
986 */ 966 */
987 if (!strcmp (" CF DX CLIENT", cp) || ns->sc_version < 1024) 967 if (ns->sc_version < 1026)
988 { 968 {
989 sprintf (version_warning, "drawinfo %d %s", NDI_RED, 969 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
990 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 970 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
991 Write_String_To_Socket (ns, version_warning, strlen (version_warning)); 971 Write_String_To_Socket (ns, version_warning, strlen (version_warning));
992 } 972 }
… …
1073 Write_String_To_Socket (ns, buf, strlen (buf)); 1053 Write_String_To_Socket (ns, buf, strlen (buf));
1074} 1054}
1075 1055
1076#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1056#define AddIfInt64(Old,New,Type) if (Old != New) {\
1077 Old = New; \ 1057 Old = New; \
1078 SockList_AddChar(&sl, Type); \ 1058 sl << uint8 (Type) << uint64 (New); \
1079 SockList_AddInt64(&sl, New); \
1080 } 1059 }
1081 1060
1082#define AddIfInt(Old,New,Type) if (Old != New) {\ 1061#define AddIfInt(Old,New,Type) if (Old != New) {\
1083 Old = New; \ 1062 Old = New; \
1084 SockList_AddChar(&sl, Type); \ 1063 sl << uint8 (Type) << uint32 (New); \
1085 SockList_AddInt(&sl, New); \
1086 } 1064 }
1087 1065
1088#define AddIfShort(Old,New,Type) if (Old != New) {\ 1066#define AddIfShort(Old,New,Type) if (Old != New) {\
1089 Old = New; \ 1067 Old = New; \
1090 SockList_AddChar(&sl, Type); \ 1068 sl << uint8 (Type) << uint16 (New); \
1091 SockList_AddShort(&sl, New); \
1092 } 1069 }
1093 1070
1094#define AddIfFloat(Old,New,Type) if (Old != New) {\ 1071#define AddIfFloat(Old,New,Type) if (Old != New) {\
1095 Old = New; \ 1072 Old = New; \
1096 SockList_AddChar(&sl, Type); \ 1073 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \
1097 SockList_AddInt(&sl,(long)(New*FLOAT_MULTI));\
1098 } 1074 }
1099 1075
1100#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 1076#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1101 if (Old) free(Old);\
1102 Old = strdup_local(New);\ 1077 free(Old); Old = strdup (New);\
1103 SockList_AddChar(&sl, Type); \ 1078 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 } 1079 }
1108 1080
1109/** 1081/**
1110 * Sends a statistics update. We look at the old values, 1082 * Sends a statistics update. We look at the old values,
1111 * and only send what has changed. Stat mapping values are in newclient.h 1083 * and only send what has changed. Stat mapping values are in newclient.h
… …
1113 * commands for now. 1085 * commands for now.
1114 */ 1086 */
1115void 1087void
1116esrv_update_stats (player *pl) 1088esrv_update_stats (player *pl)
1117{ 1089{
1118 SockList sl;
1119 char buf[MAX_BUF]; 1090 char buf[MAX_BUF];
1120 uint16 flags; 1091 uint16 flags;
1121 1092
1122 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1093 SockList sl (MAXSOCKBUF);
1123 strcpy ((char *) sl.buf, "stats "); 1094 sl << "stats ";
1124 sl.len = strlen ((char *) sl.buf);
1125 1095
1126 if (pl->ob != NULL) 1096 if (pl->ob != NULL)
1127 { 1097 {
1128 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1098 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); 1099 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); 1107 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); 1108 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); 1109 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); 1110 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1141 } 1111 }
1112
1142 if (pl->socket.exp64) 1113 if (pl->socket.exp64)
1143 { 1114 {
1144 uint8 s; 1115 uint8 s;
1145 1116
1146 for (s = 0; s < NUM_SKILLS; s++) 1117 for (s = 0; s < NUM_SKILLS; s++)
1147 { 1118 {
1148 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1119 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1149 { 1120 {
1150
1151 /* Always send along the level if exp changes. This is only 1121 /* Always send along the level if exp changes. This is only
1152 * 1 extra byte, but keeps processing simpler. 1122 * 1 extra byte, but keeps processing simpler.
1153 */ 1123 */
1154 SockList_AddChar (&sl, (char) (s + CS_STAT_SKILLINFO)); 1124 sl << uint8 (s + CS_STAT_SKILLINFO)
1155 SockList_AddChar (&sl, (char) pl->last_skill_ob[s]->level); 1125 << uint8 (pl->last_skill_ob[s]->level)
1156 SockList_AddInt64 (&sl, pl->last_skill_ob[s]->stats.exp); 1126 << uint64 (pl->last_skill_ob[s]->stats.exp);
1127
1157 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1128 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1158 } 1129 }
1159 } 1130 }
1160 } 1131 }
1132
1161 if (pl->socket.exp64) 1133 if (pl->socket.exp64)
1162 {
1163 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); 1134 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1164 }
1165 else 1135 else
1166 {
1167 AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP); 1136 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1168 } 1137
1169 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1138 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
1170 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1139 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); 1140 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); 1141 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);
1173 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1142 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
1174 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1143 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); 1144 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); 1145 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);
1177 flags = 0; 1146 flags = 0;
1147
1178 if (pl->fire_on) 1148 if (pl->fire_on)
1179 flags |= SF_FIREON; 1149 flags |= SF_FIREON;
1150
1180 if (pl->run_on) 1151 if (pl->run_on)
1181 flags |= SF_RUNON; 1152 flags |= SF_RUNON;
1182 1153
1183 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1154 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1155
1184 if (pl->socket.sc_version < 1025) 1156 if (pl->socket.sc_version < 1025)
1185 {
1186 AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR); 1157 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1187 }
1188 else 1158 else
1189 { 1159 {
1190 int i; 1160 int i;
1191 1161
1192 for (i = 0; i < NROFATTACKS; i++) 1162 for (i = 0; i < NROFATTACKS; i++)
1193 { 1163 {
1194 /* Skip ones we won't send */ 1164 /* Skip ones we won't send */
1195 if (atnr_cs_stat[i] == -1) 1165 if (atnr_cs_stat[i] == -1)
1196 continue; 1166 continue;
1167
1197 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1168 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1198 } 1169 }
1199 } 1170 }
1171
1200 if (pl->socket.monitor_spells) 1172 if (pl->socket.monitor_spells)
1201 { 1173 {
1202 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1174 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); 1175 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); 1176 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1205 } 1177 }
1178
1206 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1179 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); 1180 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE);
1208 set_title (pl->ob, buf); 1181 set_title (pl->ob, buf);
1209 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1182 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE);
1210 1183
… …
1214#ifdef ESRV_DEBUG 1187#ifdef ESRV_DEBUG
1215 LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len); 1188 LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len);
1216#endif 1189#endif
1217 Send_With_Handling (&pl->socket, &sl); 1190 Send_With_Handling (&pl->socket, &sl);
1218 } 1191 }
1219 free (sl.buf);
1220}
1221 1192
1193 sl.free ();
1194}
1222 1195
1223/** 1196/**
1224 * Tells the client that here is a player it should start using. 1197 * Tells the client that here is a player it should start using.
1225 */ 1198 */
1226void 1199void
1227esrv_new_player (player *pl, uint32 weight) 1200esrv_new_player (player *pl, uint32 weight)
1228{ 1201{
1229 SockList sl;
1230
1231 pl->last_weight = weight; 1202 pl->last_weight = weight;
1232 1203
1233 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1204 SockList sl (MAXSOCKBUF);
1205 sl << "player ";
1234 1206
1235 strcpy ((char *) sl.buf, "player "); 1207 sl << uint32 (pl->ob->count)
1236 sl.len = strlen ((char *) sl.buf); 1208 << uint32 (weight)
1237 SockList_AddInt (&sl, pl->ob->count); 1209 << uint32 (pl->ob->face->number)
1238 SockList_AddInt (&sl, weight); 1210 << 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 1211
1245 Send_With_Handling (&pl->socket, &sl); 1212 Send_With_Handling (&pl->socket, &sl);
1246 free (sl.buf); 1213 sl.free ();
1247 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1214 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1248} 1215}
1249
1250 1216
1251/** 1217/**
1252 * Need to send an animation sequence to the client. 1218 * Need to send an animation sequence to the client.
1253 * We will send appropriate face commands to the client if we haven't 1219 * 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 1220 * sent them the face yet (this can become quite costly in terms of
… …
1256 * when the player logs in and picks stuff up. 1222 * when the player logs in and picks stuff up.
1257 */ 1223 */
1258void 1224void
1259esrv_send_animation (NewSocket * ns, short anim_num) 1225esrv_send_animation (NewSocket * ns, short anim_num)
1260{ 1226{
1261 SockList sl;
1262 int i; 1227 int i;
1263 1228
1264 /* Do some checking on the anim_num we got. Note that the animations 1229 /* 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 1230 * are added in contigous order, so if the number is in the valid
1266 * range, it must be a valid animation. 1231 * range, it must be a valid animation.
… …
1269 { 1234 {
1270 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1235 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1271 return; 1236 return;
1272 } 1237 }
1273 1238
1274 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1239 SockList sl (MAXSOCKBUF);
1275 strcpy ((char *) sl.buf, "anim "); 1240
1276 sl.len = 5; 1241 sl << "anim "
1277 SockList_AddShort (&sl, anim_num); 1242 << uint16 (anim_num)
1278 SockList_AddShort (&sl, 0); /* flags - not used right now */ 1243 << uint16 (0); /* flags - not used right now */
1244
1279 /* Build up the list of faces. Also, send any information (ie, the 1245 /* Build up the list of faces. Also, send any information (ie, the
1280 * the face itself) down to the client. 1246 * the face itself) down to the client.
1281 */ 1247 */
1282 for (i = 0; i < animations[anim_num].num_animations; i++) 1248 for (i = 0; i < animations[anim_num].num_animations; i++)
1283 { 1249 {
1284 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1250 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1285 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1251 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1286 SockList_AddShort (&sl, animations[anim_num].faces[i]); /* flags - not used right now */ 1252 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1287 } 1253 }
1254
1288 Send_With_Handling (ns, &sl); 1255 Send_With_Handling (ns, &sl);
1289 free (sl.buf); 1256 sl.free ();
1257
1290 ns->anims_sent[anim_num] = 1; 1258 ns->anims_sent[anim_num] = 1;
1291} 1259}
1292 1260
1293 1261
1294/****************************************************************************** 1262/******************************************************************************
… …
1308 { 1276 {
1309 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1277 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1310 return; 1278 return;
1311 abort (); 1279 abort ();
1312 } 1280 }
1281
1313 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1282 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1314 newmap->cells[x][y].count++; 1283 newmap->cells[x][y].count++;
1284
1315 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1285 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1316 esrv_send_face (ns, face_num, 0); 1286 esrv_send_face (ns, face_num, 0);
1317} 1287}
1318 1288
1319struct LayerCell 1289struct LayerCell
… …
1426static void 1396static void
1427esrv_map_doneredraw (NewSocket * ns, struct Map *newmap) 1397esrv_map_doneredraw (NewSocket * ns, struct Map *newmap)
1428{ 1398{
1429 static long frames, bytes, tbytes, tframes; 1399 static long frames, bytes, tbytes, tframes;
1430 char *cur; 1400 char *cur;
1431 SockList sl;
1432 1401
1433 1402 SockList sl (MAXSOCKBUF);
1434 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1403 sl << "map ";
1435 strcpy ((char *) sl.buf, "map ");
1436 sl.len = strlen ((char *) sl.buf);
1437 1404
1438 cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap); 1405 cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap);
1439 sl.len = cur - (char *) sl.buf; 1406 sl.len = cur - (char *) sl.buf;
1440 1407
1441/* LOG(llevDebug, "Sending map command.\n");*/ 1408/* LOG(llevDebug, "Sending map command.\n");*/
… …
1453 memcpy (&ns->lastmap, newmap, sizeof (struct Map)); 1420 memcpy (&ns->lastmap, newmap, sizeof (struct Map));
1454 Send_With_Handling (ns, &sl); 1421 Send_With_Handling (ns, &sl);
1455 ns->sent_scroll = 0; 1422 ns->sent_scroll = 0;
1456 } 1423 }
1457 1424
1458 free (sl.buf); 1425 sl.free ();
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 (SockList &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 (SockList &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 (SockList &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 SockList sl (MAXSOCKBUF);
1871 if (socket.mapmode == Map1Cmd) 1839 SockList esl (MAXSOCKBUF);
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 2201
2237 free (sl.buf); 2202 sl.free ();
2203 esl.free ();
2238} 2204}
2239 2205
2240/** 2206/**
2241 * Draws client map. 2207 * Draws client map.
2242 */ 2208 */
… …
2247 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 2213 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
2248 New_Face *face, *floor; 2214 New_Face *face, *floor;
2249 New_Face *floor2; 2215 New_Face *floor2;
2250 int d, mflags; 2216 int d, mflags;
2251 struct Map newmap; 2217 struct Map newmap;
2252 mapstruct *m, *pm; 2218 maptile *m, *pm;
2253 2219
2254 if (pl->type != PLAYER) 2220 if (pl->type != PLAYER)
2255 { 2221 {
2256 LOG (llevError, "draw_client_map called with non player/non eric-server\n"); 2222 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
2257 return; 2223 return;
… …
2356 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap); 2322 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap);
2357 } 2323 }
2358 } /* Is a valid space */ 2324 } /* Is a valid space */
2359 } 2325 }
2360 } 2326 }
2327
2361 esrv_map_doneredraw (&pl->contr->socket, &newmap); 2328 esrv_map_doneredraw (&pl->contr->socket, &newmap);
2362 2329
2363 check_map_change (pl->contr); 2330 check_map_change (pl->contr);
2364} 2331}
2365 2332
… …
2382/** 2349/**
2383 * This sends the skill number to name mapping. We ignore 2350 * This sends the skill number to name mapping. We ignore
2384 * the params - we always send the same info no matter what. 2351 * the params - we always send the same info no matter what.
2385 */ 2352 */
2386void 2353void
2387send_skill_info (NewSocket * ns, char *params) 2354send_skill_info (NewSocket *ns, char *params)
2388{ 2355{
2389 SockList sl; 2356 SockList sl (MAXSOCKBUF);
2390 int i; 2357 sl << "replyinfo skill_info\n";
2391 2358
2392 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
2393 strcpy ((char *) sl.buf, "replyinfo skill_info\n");
2394 for (i = 1; i < NUM_SKILLS; i++) 2359 for (int i = 1; i < NUM_SKILLS; i++)
2395 { 2360 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]); 2361
2397 }
2398 sl.len = strlen ((char *) sl.buf);
2399 if (sl.len >= MAXSOCKBUF) 2362 if (sl.len >= MAXSOCKBUF)
2400 { 2363 {
2401 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2364 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2402 fatal (0); 2365 fatal (0);
2403 } 2366 }
2367
2404 Send_With_Handling (ns, &sl); 2368 Send_With_Handling (ns, &sl);
2405 free (sl.buf); 2369 sl.free ();
2406} 2370}
2407 2371
2408/** 2372/**
2409 * This sends the spell path to name mapping. We ignore 2373 * This sends the spell path to name mapping. We ignore
2410 * the params - we always send the same info no matter what. 2374 * the params - we always send the same info no matter what.
2411 */ 2375 */
2412void 2376void
2413send_spell_paths (NewSocket * ns, char *params) 2377send_spell_paths (NewSocket * ns, char *params)
2414{ 2378{
2415 SockList sl; 2379 SockList sl (MAXSOCKBUF);
2416 int i;
2417 2380
2418 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2381 sl << "replyinfo spell_paths\n";
2419 strcpy ((char *) sl.buf, "replyinfo spell_paths\n"); 2382
2420 for (i = 0; i < NRSPELLPATHS; i++) 2383 for (int i = 0; i < NRSPELLPATHS; i++)
2421 sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", 1 << i, spellpathnames[i]); 2384 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2422 sl.len = strlen ((char *) sl.buf); 2385
2423 if (sl.len >= MAXSOCKBUF) 2386 if (sl.len >= MAXSOCKBUF)
2424 { 2387 {
2425 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2388 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2426 fatal (0); 2389 fatal (0);
2427 } 2390 }
2391
2428 Send_With_Handling (ns, &sl); 2392 Send_With_Handling (ns, &sl);
2429 free (sl.buf); 2393 sl.free ();
2430} 2394}
2431 2395
2432/** 2396/**
2433 * This looks for any spells the player may have that have changed their stats. 2397 * 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 2398 * it then sends an updspell packet for each spell that has changed in this way
2435 */ 2399 */
2436void 2400void
2437esrv_update_spells (player *pl) 2401esrv_update_spells (player *pl)
2438{ 2402{
2439 SockList sl;
2440 int flags = 0;
2441 object *spell;
2442
2443 if (!pl->socket.monitor_spells) 2403 if (!pl->socket.monitor_spells)
2444 return; 2404 return;
2405
2445 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2406 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2446 { 2407 {
2447 if (spell->type == SPELL) 2408 if (spell->type == SPELL)
2448 { 2409 {
2410 int flags = 0;
2411
2449 /* check if we need to update it */ 2412 /* check if we need to update it */
2450 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 2413 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
2451 { 2414 {
2452 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 2415 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2453 flags |= UPD_SP_MANA; 2416 flags |= UPD_SP_MANA;
2454 } 2417 }
2418
2455 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 2419 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
2456 { 2420 {
2457 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 2421 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2458 flags |= UPD_SP_GRACE; 2422 flags |= UPD_SP_GRACE;
2459 } 2423 }
2424
2460 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 2425 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
2461 { 2426 {
2462 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 2427 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2463 flags |= UPD_SP_DAMAGE; 2428 flags |= UPD_SP_DAMAGE;
2464 } 2429 }
2430
2465 if (flags != 0) 2431 if (flags)
2466 { 2432 {
2467 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2433 SockList sl (MAXSOCKBUF);
2468 strcpy ((char *) sl.buf, "updspell "); 2434
2469 sl.len = strlen ((char *) sl.buf); 2435 sl << "updspell "
2470 SockList_AddChar (&sl, flags); 2436 << uint8 (flags)
2471 SockList_AddInt (&sl, spell->count); 2437 << uint32 (spell->count);
2472 if (flags & UPD_SP_MANA) 2438
2473 SockList_AddShort (&sl, spell->last_sp); 2439 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2474 if (flags & UPD_SP_GRACE) 2440 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2475 SockList_AddShort (&sl, spell->last_grace); 2441 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2476 if (flags & UPD_SP_DAMAGE) 2442
2477 SockList_AddShort (&sl, spell->last_eat);
2478 flags = 0;
2479 Send_With_Handling (&pl->socket, &sl); 2443 Send_With_Handling (&pl->socket, &sl);
2480 free (sl.buf); 2444 sl.free ();
2481 } 2445 }
2482 } 2446 }
2483 } 2447 }
2484} 2448}
2485 2449
2486void 2450void
2487esrv_remove_spell (player *pl, object *spell) 2451esrv_remove_spell (player *pl, object *spell)
2488{ 2452{
2489 SockList sl;
2490
2491 if (!pl->socket.monitor_spells) 2453 if (!pl->socket.monitor_spells)
2492 return; 2454 return;
2455
2493 if (!pl || !spell || spell->env != pl->ob) 2456 if (!pl || !spell || spell->env != pl->ob)
2494 { 2457 {
2495 LOG (llevError, "Invalid call to esrv_remove_spell"); 2458 LOG (llevError, "Invalid call to esrv_remove_spell");
2496 return; 2459 return;
2497 } 2460 }
2498 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2461
2499 strcpy ((char *) sl.buf, "delspell "); 2462 SockList sl (MAXSOCKBUF);
2500 sl.len = strlen ((char *) sl.buf); 2463
2501 SockList_AddInt (&sl, spell->count); 2464 sl << "delspell "
2465 << uint32 (spell->count);
2466
2502 Send_With_Handling (&pl->socket, &sl); 2467 Send_With_Handling (&pl->socket, &sl);
2503 free (sl.buf); 2468 sl.free ();
2504} 2469}
2505 2470
2506/* appends the spell *spell to the Socklist we will send the data to. */ 2471/* appends the spell *spell to the Socklist we will send the data to. */
2507static void 2472static void
2508append_spell (player *pl, SockList * sl, object *spell) 2473append_spell (player *pl, SockList &sl, object *spell)
2509{ 2474{
2510 int len, i, skill = 0; 2475 int len, i, skill = 0;
2511 2476
2512 if (!(spell->name)) 2477 if (!(spell->name))
2513 { 2478 {
2514 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 2479 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2515 return; 2480 return;
2516 } 2481 }
2517 SockList_AddInt (sl, spell->count); 2482
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 */ 2483 /* 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); 2484 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); 2485 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); 2486 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 2487
2529 /* figure out which skill it uses, if it uses one */ 2488 /* figure out which skill it uses, if it uses one */
2530 if (spell->skill) 2489 if (spell->skill)
2531 { 2490 {
2532 for (i = 1; i < NUM_SKILLS; i++) 2491 for (i = 1; i < NUM_SKILLS; i++)
… …
2534 { 2493 {
2535 skill = i + CS_STAT_SKILLINFO; 2494 skill = i + CS_STAT_SKILLINFO;
2536 break; 2495 break;
2537 } 2496 }
2538 } 2497 }
2539 SockList_AddChar (sl, skill);
2540 2498
2541 SockList_AddInt (sl, spell->path_attuned); 2499 /* send the current values */
2500 sl << uint32 (spell->count)
2501 << uint16 (spell->level)
2502 << uint16 (spell->casting_time)
2503 << uint16 (spell->last_sp)
2504 << uint16 (spell->last_grace)
2505 << uint16 (spell->last_eat)
2506 << uint8 (skill)
2507 << uint32 (spell->path_attuned)
2542 SockList_AddInt (sl, (spell->face) ? spell->face->number : 0); 2508 << uint32 (spell->face ? spell->face->number : 0)
2543 2509 << data8 (spell->name)
2544 len = strlen (spell->name); 2510 << 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} 2511}
2561 2512
2562/** 2513/**
2563 * This tells the client to add the spell *ob, if *ob is NULL, then add 2514 * This tells the client to add the spell *ob, if *ob is NULL, then add
2564 * all spells in the player's inventory. 2515 * all spells in the player's inventory.
2565 */ 2516 */
2566void 2517void
2567esrv_add_spells (player *pl, object *spell) 2518esrv_add_spells (player *pl, object *spell)
2568{ 2519{
2569 SockList sl;
2570
2571 if (!pl) 2520 if (!pl)
2572 { 2521 {
2573 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2522 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2574 return; 2523 return;
2575 } 2524 }
2525
2576 if (!pl->socket.monitor_spells) 2526 if (!pl->socket.monitor_spells)
2577 return; 2527 return;
2578 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2528
2579 strcpy ((char *) sl.buf, "addspell "); 2529 SockList sl (MAXSOCKBUF);
2580 sl.len = strlen ((char *) sl.buf); 2530
2531 sl << "addspell ";
2532
2581 if (!spell) 2533 if (!spell)
2582 { 2534 {
2583 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2535 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2584 { 2536 {
2585 /* were we to simply keep appending data here, we could exceed 2537 /* 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 2547 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2596 * like it will fix this 2548 * like it will fix this
2597 */ 2549 */
2598 if (spell->type != SPELL) 2550 if (spell->type != SPELL)
2599 continue; 2551 continue;
2552
2600 if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2553 if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2601 { 2554 {
2602 Send_With_Handling (&pl->socket, &sl); 2555 Send_With_Handling (&pl->socket, &sl);
2603 strcpy ((char *) sl.buf, "addspell "); 2556 strcpy ((char *) sl.buf, "addspell ");
2604 sl.len = strlen ((char *) sl.buf); 2557 sl.len = strlen ((char *) sl.buf);
2605 } 2558 }
2559
2606 append_spell (pl, &sl, spell); 2560 append_spell (pl, sl, spell);
2607 } 2561 }
2608 } 2562 }
2609 else if (spell->type != SPELL) 2563 else if (spell->type != SPELL)
2610 { 2564 {
2611 LOG (llevError, "Asked to send a non-spell object as a spell"); 2565 LOG (llevError, "Asked to send a non-spell object as a spell");
2612 return; 2566 return;
2613 } 2567 }
2614 else 2568 else
2615 append_spell (pl, &sl, spell); 2569 append_spell (pl, sl, spell);
2570
2616 if (sl.len >= MAXSOCKBUF) 2571 if (sl.length () >= MAXSOCKBUF)
2617 { 2572 {
2618 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2573 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2619 fatal (0); 2574 fatal (0);
2620 } 2575 }
2576
2621 /* finally, we can send the packet */ 2577 /* finally, we can send the packet */
2622 Send_With_Handling (&pl->socket, &sl); 2578 Send_With_Handling (&pl->socket, &sl);
2623 free (sl.buf); 2579
2580 sl.free ();
2624} 2581}
2582

Diff Legend

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