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.28 by root, Wed Dec 13 18:51:50 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
… …
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
… …
690 */ 682 */
691static void 683static void
692SendSmooth (NewSocket * ns, uint16 face) 684SendSmooth (NewSocket * ns, uint16 face)
693{ 685{
694 uint16 smoothface; 686 uint16 smoothface;
695 unsigned char reply[MAX_BUF];
696 SockList sl;
697 687
698 /* 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
699 * again. 689 * again.
700 */ 690 */
701 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 691 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
… …
709 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 699 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
710 esrv_send_face (ns, smoothface, 0); 700 esrv_send_face (ns, smoothface, 0);
711 701
712 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 702 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
713 703
714 sl.buf = reply; 704 SockList sl (MAXSOCKBUF);
715 strcpy ((char *) sl.buf, "smooth "); 705
716 sl.len = strlen ((char *) sl.buf); 706 sl << "smooth "
717 SockList_AddShort (&sl, face); 707 << uint16 (face)
718 SockList_AddShort (&sl, smoothface); 708 << uint16 (smoothface);
709
719 Send_With_Handling (ns, &sl); 710 Send_With_Handling (ns, &sl);
711 sl.free ();
720} 712}
721 713
722 /** 714 /**
723 * Tells client the picture it has to use 715 * Tells client the picture it has to use
724 * to smooth a picture number given as argument. 716 * to smooth a picture number given as argument.
… …
730 722
731 facenbr = atoi (buf); 723 facenbr = atoi (buf);
732 SendSmooth (ns, facenbr); 724 SendSmooth (ns, facenbr);
733} 725}
734 726
735
736
737
738
739/** 727/**
740 * 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,
741 * etc.) 729 * etc.)
742 */ 730 */
743void 731void
… …
796 */ 784 */
797void 785void
798NewPlayerCmd (uint8 * buf, int len, player *pl) 786NewPlayerCmd (uint8 * buf, int len, player *pl)
799{ 787{
800 int time, repeat; 788 int time, repeat;
789 char command[MAX_BUF];
801 short packet; 790 short packet;
802 unsigned char command[MAX_BUF];
803 SockList sl;
804 791
805 if (len < 7) 792 if (len < 7)
806 { 793 {
807 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);
808 return; 795 return;
… …
810 797
811 packet = GetShort_String (buf); 798 packet = GetShort_String (buf);
812 repeat = GetInt_String (buf + 2); 799 repeat = GetInt_String (buf + 2);
813 /* -1 is special - no repeat, but don't update */ 800 /* -1 is special - no repeat, but don't update */
814 if (repeat != -1) 801 if (repeat != -1)
815 {
816 pl->count = repeat; 802 pl->count = repeat;
817 } 803
818 if ((len - 4) >= MAX_BUF) 804 if ((len - 4) >= MAX_BUF)
819 len = MAX_BUF - 5; 805 len = MAX_BUF - 5;
820 806
821 strncpy ((char *) command, (char *) buf + 6, len - 4); 807 strncpy ((char *) command, (char *) buf + 6, len - 4);
822 command[len - 4] = '\0'; 808 command[len - 4] = '\0';
… …
832 return; 818 return;
833 } 819 }
834 820
835 /* This should not happen anymore. */ 821 /* This should not happen anymore. */
836 if (pl->ob->speed_left < -1.0) 822 if (pl->ob->speed_left < -1.0)
837 {
838 LOG (llevError, "Player has negative time - shouldn't do command.\n"); 823 LOG (llevError, "Player has negative time - shouldn't do command.\n");
839 } 824
840 /* In c_new.c */ 825 /* In c_new.c */
841 execute_newserver_command (pl->ob, (char *) command); 826 execute_newserver_command (pl->ob, (char *) command);
842 /* Perhaps something better should be done with a left over count. 827 /* Perhaps something better should be done with a left over count.
843 * Cleaning up the input should probably be done first - all actions 828 * 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 829 * for the command that issued the count should be done before any other
845 * commands. 830 * commands.
846 */ 831 */
847 pl->count = 0; 832 pl->count = 0;
848 833
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) 834 if (FABS (pl->ob->speed) < 0.001)
855 time = MAX_TIME * 100; 835 time = MAX_TIME * 100;
856 else 836 else
857 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 837 time = (int) (MAX_TIME / FABS (pl->ob->speed));
858 SockList_AddInt (&sl, time); 838
839 /* Send confirmation of command execution now */
840
841 SockList sl (MAXSOCKBUF);
842 sl << "comc " << uint16 (packet) << uint32 (time);
859 Send_With_Handling (&pl->socket, &sl); 843 Send_With_Handling (&pl->socket, &sl);
844 sl.free ();
860} 845}
861 846
862 847
863/** This is a reply to a previous query. */ 848/** This is a reply to a previous query. */
864void 849void
… …
1067 Write_String_To_Socket (ns, buf, strlen (buf)); 1052 Write_String_To_Socket (ns, buf, strlen (buf));
1068} 1053}
1069 1054
1070#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1055#define AddIfInt64(Old,New,Type) if (Old != New) {\
1071 Old = New; \ 1056 Old = New; \
1072 SockList_AddChar(&sl, Type); \ 1057 sl << uint8 (Type) << uint64 (New); \
1073 SockList_AddInt64(&sl, New); \
1074 } 1058 }
1075 1059
1076#define AddIfInt(Old,New,Type) if (Old != New) {\ 1060#define AddIfInt(Old,New,Type) if (Old != New) {\
1077 Old = New; \ 1061 Old = New; \
1078 SockList_AddChar(&sl, Type); \ 1062 sl << uint8 (Type) << uint32 (New); \
1079 SockList_AddInt(&sl, New); \
1080 } 1063 }
1081 1064
1082#define AddIfShort(Old,New,Type) if (Old != New) {\ 1065#define AddIfShort(Old,New,Type) if (Old != New) {\
1083 Old = New; \ 1066 Old = New; \
1084 SockList_AddChar(&sl, Type); \ 1067 sl << uint8 (Type) << uint16 (New); \
1085 SockList_AddShort(&sl, New); \
1086 } 1068 }
1087 1069
1088#define AddIfFloat(Old,New,Type) if (Old != New) {\ 1070#define AddIfFloat(Old,New,Type) if (Old != New) {\
1089 Old = New; \ 1071 Old = New; \
1090 SockList_AddChar(&sl, Type); \ 1072 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \
1091 SockList_AddInt(&sl,(long)(New*FLOAT_MULTI));\
1092 } 1073 }
1093 1074
1094#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 1075#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1095 if (Old) free(Old);\
1096 Old = strdup_local(New);\ 1076 free(Old); Old = strdup (New);\
1097 SockList_AddChar(&sl, Type); \ 1077 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 } 1078 }
1102 1079
1103/** 1080/**
1104 * Sends a statistics update. We look at the old values, 1081 * Sends a statistics update. We look at the old values,
1105 * and only send what has changed. Stat mapping values are in newclient.h 1082 * and only send what has changed. Stat mapping values are in newclient.h
… …
1107 * commands for now. 1084 * commands for now.
1108 */ 1085 */
1109void 1086void
1110esrv_update_stats (player *pl) 1087esrv_update_stats (player *pl)
1111{ 1088{
1112 SockList sl;
1113 char buf[MAX_BUF]; 1089 char buf[MAX_BUF];
1114 uint16 flags; 1090 uint16 flags;
1115 1091
1116 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1092 SockList sl (MAXSOCKBUF);
1117 strcpy ((char *) sl.buf, "stats "); 1093 sl << "stats ";
1118 sl.len = strlen ((char *) sl.buf);
1119 1094
1120 if (pl->ob != NULL) 1095 if (pl->ob != NULL)
1121 { 1096 {
1122 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1097 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); 1098 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); 1106 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); 1107 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); 1108 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); 1109 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1135 } 1110 }
1111
1136 if (pl->socket.exp64) 1112 if (pl->socket.exp64)
1137 { 1113 {
1138 uint8 s; 1114 uint8 s;
1139 1115
1140 for (s = 0; s < NUM_SKILLS; s++) 1116 for (s = 0; s < NUM_SKILLS; s++)
1141 { 1117 {
1142 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1118 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1143 { 1119 {
1144
1145 /* Always send along the level if exp changes. This is only 1120 /* Always send along the level if exp changes. This is only
1146 * 1 extra byte, but keeps processing simpler. 1121 * 1 extra byte, but keeps processing simpler.
1147 */ 1122 */
1148 SockList_AddChar (&sl, (char) (s + CS_STAT_SKILLINFO)); 1123 sl << uint8 (s + CS_STAT_SKILLINFO)
1149 SockList_AddChar (&sl, (char) pl->last_skill_ob[s]->level); 1124 << uint8 (pl->last_skill_ob[s]->level)
1150 SockList_AddInt64 (&sl, pl->last_skill_ob[s]->stats.exp); 1125 << uint64 (pl->last_skill_ob[s]->stats.exp);
1126
1151 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1127 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1152 } 1128 }
1153 } 1129 }
1154 } 1130 }
1131
1155 if (pl->socket.exp64) 1132 if (pl->socket.exp64)
1156 {
1157 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); 1133 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1158 }
1159 else 1134 else
1160 {
1161 AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP); 1135 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1162 } 1136
1163 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1137 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
1164 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1138 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); 1139 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); 1140 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);
1167 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1141 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
1168 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1142 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); 1143 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); 1144 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);
1171 flags = 0; 1145 flags = 0;
1146
1172 if (pl->fire_on) 1147 if (pl->fire_on)
1173 flags |= SF_FIREON; 1148 flags |= SF_FIREON;
1149
1174 if (pl->run_on) 1150 if (pl->run_on)
1175 flags |= SF_RUNON; 1151 flags |= SF_RUNON;
1176 1152
1177 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1153 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1154
1178 if (pl->socket.sc_version < 1025) 1155 if (pl->socket.sc_version < 1025)
1179 {
1180 AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR); 1156 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1181 }
1182 else 1157 else
1183 { 1158 {
1184 int i; 1159 int i;
1185 1160
1186 for (i = 0; i < NROFATTACKS; i++) 1161 for (i = 0; i < NROFATTACKS; i++)
1187 { 1162 {
1188 /* Skip ones we won't send */ 1163 /* Skip ones we won't send */
1189 if (atnr_cs_stat[i] == -1) 1164 if (atnr_cs_stat[i] == -1)
1190 continue; 1165 continue;
1166
1191 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1167 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1192 } 1168 }
1193 } 1169 }
1170
1194 if (pl->socket.monitor_spells) 1171 if (pl->socket.monitor_spells)
1195 { 1172 {
1196 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1173 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); 1174 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); 1175 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1199 } 1176 }
1177
1200 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1178 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); 1179 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE);
1202 set_title (pl->ob, buf); 1180 set_title (pl->ob, buf);
1203 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1181 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE);
1204 1182
… …
1208#ifdef ESRV_DEBUG 1186#ifdef ESRV_DEBUG
1209 LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len); 1187 LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len);
1210#endif 1188#endif
1211 Send_With_Handling (&pl->socket, &sl); 1189 Send_With_Handling (&pl->socket, &sl);
1212 } 1190 }
1213 free (sl.buf);
1214}
1215 1191
1192 sl.free ();
1193}
1216 1194
1217/** 1195/**
1218 * Tells the client that here is a player it should start using. 1196 * Tells the client that here is a player it should start using.
1219 */ 1197 */
1220void 1198void
1221esrv_new_player (player *pl, uint32 weight) 1199esrv_new_player (player *pl, uint32 weight)
1222{ 1200{
1223 SockList sl;
1224
1225 pl->last_weight = weight; 1201 pl->last_weight = weight;
1226 1202
1227 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1203 SockList sl (MAXSOCKBUF);
1204 sl << "player ";
1228 1205
1229 strcpy ((char *) sl.buf, "player "); 1206 sl << uint32 (pl->ob->count)
1230 sl.len = strlen ((char *) sl.buf); 1207 << uint32 (weight)
1231 SockList_AddInt (&sl, pl->ob->count); 1208 << uint32 (pl->ob->face->number)
1232 SockList_AddInt (&sl, weight); 1209 << 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 1210
1239 Send_With_Handling (&pl->socket, &sl); 1211 Send_With_Handling (&pl->socket, &sl);
1240 free (sl.buf); 1212 sl.free ();
1241 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1213 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1242} 1214}
1243
1244 1215
1245/** 1216/**
1246 * Need to send an animation sequence to the client. 1217 * Need to send an animation sequence to the client.
1247 * We will send appropriate face commands to the client if we haven't 1218 * 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 1219 * sent them the face yet (this can become quite costly in terms of
… …
1250 * when the player logs in and picks stuff up. 1221 * when the player logs in and picks stuff up.
1251 */ 1222 */
1252void 1223void
1253esrv_send_animation (NewSocket * ns, short anim_num) 1224esrv_send_animation (NewSocket * ns, short anim_num)
1254{ 1225{
1255 SockList sl;
1256 int i; 1226 int i;
1257 1227
1258 /* Do some checking on the anim_num we got. Note that the animations 1228 /* 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 1229 * are added in contigous order, so if the number is in the valid
1260 * range, it must be a valid animation. 1230 * range, it must be a valid animation.
… …
1263 { 1233 {
1264 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1234 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1265 return; 1235 return;
1266 } 1236 }
1267 1237
1268 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1238 SockList sl (MAXSOCKBUF);
1269 strcpy ((char *) sl.buf, "anim "); 1239
1270 sl.len = 5; 1240 sl << "anim "
1271 SockList_AddShort (&sl, anim_num); 1241 << uint16 (anim_num)
1272 SockList_AddShort (&sl, 0); /* flags - not used right now */ 1242 << uint16 (0); /* flags - not used right now */
1243
1273 /* Build up the list of faces. Also, send any information (ie, the 1244 /* Build up the list of faces. Also, send any information (ie, the
1274 * the face itself) down to the client. 1245 * the face itself) down to the client.
1275 */ 1246 */
1276 for (i = 0; i < animations[anim_num].num_animations; i++) 1247 for (i = 0; i < animations[anim_num].num_animations; i++)
1277 { 1248 {
1278 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1249 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1279 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1250 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1280 SockList_AddShort (&sl, animations[anim_num].faces[i]); /* flags - not used right now */ 1251 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1281 } 1252 }
1253
1282 Send_With_Handling (ns, &sl); 1254 Send_With_Handling (ns, &sl);
1283 free (sl.buf); 1255 sl.free ();
1256
1284 ns->anims_sent[anim_num] = 1; 1257 ns->anims_sent[anim_num] = 1;
1285} 1258}
1286 1259
1287 1260
1288/****************************************************************************** 1261/******************************************************************************
… …
1302 { 1275 {
1303 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1276 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1304 return; 1277 return;
1305 abort (); 1278 abort ();
1306 } 1279 }
1280
1307 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1281 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1308 newmap->cells[x][y].count++; 1282 newmap->cells[x][y].count++;
1283
1309 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1284 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1310 esrv_send_face (ns, face_num, 0); 1285 esrv_send_face (ns, face_num, 0);
1311} 1286}
1312 1287
1313struct LayerCell 1288struct LayerCell
… …
1420static void 1395static void
1421esrv_map_doneredraw (NewSocket * ns, struct Map *newmap) 1396esrv_map_doneredraw (NewSocket * ns, struct Map *newmap)
1422{ 1397{
1423 static long frames, bytes, tbytes, tframes; 1398 static long frames, bytes, tbytes, tframes;
1424 char *cur; 1399 char *cur;
1425 SockList sl;
1426 1400
1427 1401 SockList sl (MAXSOCKBUF);
1428 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1402 sl << "map ";
1429 strcpy ((char *) sl.buf, "map ");
1430 sl.len = strlen ((char *) sl.buf);
1431 1403
1432 cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap); 1404 cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap);
1433 sl.len = cur - (char *) sl.buf; 1405 sl.len = cur - (char *) sl.buf;
1434 1406
1435/* LOG(llevDebug, "Sending map command.\n");*/ 1407/* LOG(llevDebug, "Sending map command.\n");*/
… …
1447 memcpy (&ns->lastmap, newmap, sizeof (struct Map)); 1419 memcpy (&ns->lastmap, newmap, sizeof (struct Map));
1448 Send_With_Handling (ns, &sl); 1420 Send_With_Handling (ns, &sl);
1449 ns->sent_scroll = 0; 1421 ns->sent_scroll = 0;
1450 } 1422 }
1451 1423
1452 free (sl.buf); 1424 sl.free ();
1453} 1425}
1454 1426
1455 1427
1456/** Clears a map cell */ 1428/** Clears a map cell */
1457static void 1429static void
1458map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1430map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1459{ 1431{
1460 cell->faces[0] = face0; 1432 cell->faces[0] = face0;
1461 cell->faces[1] = face1; 1433 cell->faces[1] = face1;
1462 cell->faces[2] = face2; 1434 cell->faces[2] = face2;
1463 cell->count = count; 1435 cell->count = count;
1464 cell->stat_hp = 0; 1436 cell->stat_hp = 0;
1437 cell->flags = 0;
1465 cell->player = 0; 1438 cell->player = 0;
1466} 1439}
1467 1440
1468#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) 1441#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1469#define MAX_LAYERS 3 1442#define MAX_LAYERS 3
1470 1443
… …
1498 * needs to get sent - if so, it adds the data, sending the head 1471 * 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 1472 * if needed, and returning 1. If this no data needs to get
1500 * sent, it returns zero. 1473 * sent, it returns zero.
1501 */ 1474 */
1502static int 1475static int
1503check_head (SockList & sl, NewSocket & ns, int ax, int ay, int layer) 1476check_head (SockList &sl, NewSocket &ns, int ax, int ay, int layer)
1504{ 1477{
1505 short face_num; 1478 short face_num;
1506 1479
1507 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1480 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1508 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1481 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
… …
1512 if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) 1485 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1513 { 1486 {
1514 SockList_AddShort (&sl, face_num); 1487 SockList_AddShort (&sl, face_num);
1515 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1488 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1516 esrv_send_face (&ns, face_num, 0); 1489 esrv_send_face (&ns, face_num, 0);
1490
1517 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; 1491 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1518 ns.lastmap.cells[ax][ay].faces[layer] = face_num; 1492 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1519 return 1; 1493 return 1;
1520 } 1494 }
1521 1495
… …
1541 * the case, it seems to make more sense to have these layer values 1515 * the case, it seems to make more sense to have these layer values
1542 * actually match. 1516 * actually match.
1543 */ 1517 */
1544 1518
1545static int 1519static int
1546update_space (SockList * sl, NewSocket * ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1520update_space (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1547{ 1521{
1548 object *ob, *head; 1522 object *ob, *head;
1549 uint16 face_num; 1523 uint16 face_num;
1550 int bx, by, i; 1524 int bx, by, i;
1551 1525
1552 /* If there is a multipart object stored away, treat that as more important. 1526 /* If there is a multipart object stored away, treat that as more important.
1553 * If not, then do the normal processing. 1527 * If not, then do the normal processing.
1554 */ 1528 */
1555
1556 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; 1529 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1557 1530
1558 /* Check to see if this head is part of the set of objects 1531 /* Check to see if this head is part of the set of objects
1559 * we would normally send for this space. If so, then 1532 * we would normally send for this space. If so, then
1560 * don't use the head value. We need to do the check 1533 * don't use the head value. We need to do the check
… …
1725 1698
1726 /* Another hack - because of heads and whatnot, this face may match one 1699 /* 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 1700 * we already sent for a lower layer. In that case, don't send
1728 * this one. 1701 * this one.
1729 */ 1702 */
1730 if (face_num && layer + 1 < MAP_LAYERS && ns->lastmap.cells[sx][sy].faces[layer + 1] == face_num) 1703 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1731 {
1732 face_num = 0; 1704 face_num = 0;
1733 }
1734 1705
1735 /* We've gotten what face we want to use for the object. Now see if 1706 /* 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. 1707 * if it has changed since we last sent it to the client.
1737 */ 1708 */
1738 if (ns->lastmap.cells[sx][sy].faces[layer] != face_num) 1709 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
1739 { 1710 {
1740 ns->lastmap.cells[sx][sy].faces[layer] = face_num; 1711 ns.lastmap.cells[sx][sy].faces[layer] = face_num;
1741 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1712 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1742 esrv_send_face (ns, face_num, 0); 1713 esrv_send_face (&ns, face_num, 0);
1743 SockList_AddShort (sl, face_num); 1714
1715 sl << uint16 (face_num);
1744 return 1; 1716 return 1;
1745 } 1717 }
1718
1746 /* Nothing changed */ 1719 /* Nothing changed */
1747 return 0; 1720 return 0;
1748} 1721}
1749 1722
1750/** 1723/**
… …
1765 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1738 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1766 * take. 1739 * take.
1767 */ 1740 */
1768 1741
1769static inline int 1742static inline int
1770update_smooth (SockList * sl, NewSocket * ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1743update_smooth (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1771{ 1744{
1772 object *ob; 1745 object *ob;
1773 int smoothlevel; /* old face_num; */ 1746 int smoothlevel; /* old face_num; */
1774 1747
1775 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1748 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1780 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1753 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1781 smoothlevel = 0; 1754 smoothlevel = 0;
1782 else 1755 else
1783 { 1756 {
1784 smoothlevel = ob->smoothlevel; 1757 smoothlevel = ob->smoothlevel;
1785 if (smoothlevel && !(ns->faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1758 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1786 SendSmooth (ns, ob->face->number); 1759 SendSmooth (&ns, ob->face->number);
1787 } /* else not already head object or blank face */ 1760 } /* else not already head object or blank face */
1788 1761
1789 /* We've gotten what face we want to use for the object. Now see if 1762 /* 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. 1763 * if it has changed since we last sent it to the client.
1791 */ 1764 */
1792 if (smoothlevel > 255) 1765 if (smoothlevel > 255)
1793 smoothlevel = 255; 1766 smoothlevel = 255;
1794 else if (smoothlevel < 0) 1767 else if (smoothlevel < 0)
1795 smoothlevel = 0; 1768 smoothlevel = 0;
1769
1796 if (ns->lastmap.cells[sx][sy].smooth[layer] != smoothlevel) 1770 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1797 { 1771 {
1798 ns->lastmap.cells[sx][sy].smooth[layer] = smoothlevel; 1772 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1799 SockList_AddChar (sl, (uint8) (smoothlevel & 0xFF)); 1773 sl << uint8 (smoothlevel);
1800 return 1; 1774 return 1;
1801 } 1775 }
1776
1802 /* Nothing changed */ 1777 /* Nothing changed */
1803 return 0; 1778 return 0;
1804} 1779}
1805 1780
1806/** 1781/**
… …
1847draw_client_map1 (object *pl) 1822draw_client_map1 (object *pl)
1848{ 1823{
1849 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1824 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;
1850 sint16 nx, ny; 1825 sint16 nx, ny;
1851 int estartlen, eoldlen; 1826 int estartlen, eoldlen;
1852 SockList sl;
1853 SockList esl; /*For extended Map info */
1854 uint16 mask, emask; 1827 uint16 mask, emask;
1855 uint8 eentrysize; 1828 uint8 eentrysize;
1856 uint16 ewhatstart, ewhatflag; 1829 uint16 ewhatstart, ewhatflag;
1857 uint8 extendedinfos; 1830 uint8 extendedinfos;
1858 maptile *m; 1831 maptile *m;
1859 1832
1860 NewSocket & socket = pl->contr->socket; 1833 NewSocket &socket = pl->contr->socket;
1861 1834
1862 check_map_change (pl->contr); 1835 check_map_change (pl->contr);
1863 1836
1864 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1837 SockList sl (MAXSOCKBUF);
1865 if (socket.mapmode == Map1Cmd) 1838 SockList esl (MAXSOCKBUF);
1866 strcpy ((char *) sl.buf, "map1 "); 1839
1867 else 1840 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1868 strcpy ((char *) sl.buf, "map1a ");
1869 sl.len = strlen ((char *) sl.buf);
1870 startlen = sl.len; 1841 startlen = sl.len;
1842
1871 /*Extendedmapinfo structure initialisation */ 1843 /*Extendedmapinfo structure initialisation */
1872 if (socket.ext_mapinfos) 1844 if (socket.ext_mapinfos)
1873 { 1845 {
1874 esl.buf = (unsigned char *) malloc (MAXSOCKBUF);
1875 strcpy ((char *) esl.buf, "mapextended ");
1876 esl.len = strlen ((char *) esl.buf);
1877 extendedinfos = EMI_NOREDRAW; 1846 extendedinfos = EMI_NOREDRAW;
1847
1878 if (socket.EMI_smooth) 1848 if (socket.EMI_smooth)
1879 extendedinfos |= EMI_SMOOTH; 1849 extendedinfos |= EMI_SMOOTH;
1850
1880 ewhatstart = esl.len; 1851 ewhatstart = esl.len;
1881 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1852 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1882 could need to be taken away */ 1853 could need to be taken away */
1883 SockList_AddChar (&esl, extendedinfos);
1884 eentrysize = getExtendedMapInfoSize (&socket); 1854 eentrysize = getExtendedMapInfoSize (&socket);
1885 SockList_AddChar (&esl, eentrysize); 1855 esl << "mapextended "
1856 << uint8 (extendedinfos)
1857 << uint8 (eentrysize);
1886 estartlen = esl.len; 1858 estartlen = esl.len;
1887 } 1859 }
1888 else 1860 else
1889 { 1861 {
1890 /* suppress compiler warnings */ 1862 /* suppress compiler warnings */
1891 ewhatstart = 0; 1863 ewhatstart = 0;
1892 ewhatflag = 0; 1864 ewhatflag = 0;
1893 estartlen = 0; 1865 estartlen = 0;
1894 } 1866 }
1867
1895 /* Init data to zero */ 1868 /* Init data to zero */
1896 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS); 1869 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1897 1870
1898 /* x,y are the real map locations. ax, ay are viewport relative 1871 /* x,y are the real map locations. ax, ay are viewport relative
1899 * locations. 1872 * locations.
… …
1903 /* We could do this logic as conditionals in the if statement, 1876 /* We could do this logic as conditionals in the if statement,
1904 * but that started to get a bit messy to look at. 1877 * but that started to get a bit messy to look at.
1905 */ 1878 */
1906 max_x = pl->x + (socket.mapx + 1) / 2; 1879 max_x = pl->x + (socket.mapx + 1) / 2;
1907 max_y = pl->y + (socket.mapy + 1) / 2; 1880 max_y = pl->y + (socket.mapy + 1) / 2;
1881
1908 if (socket.mapmode == Map1aCmd) 1882 if (socket.mapmode == Map1aCmd)
1909 { 1883 {
1910 max_x += MAX_HEAD_OFFSET; 1884 max_x += MAX_HEAD_OFFSET;
1911 max_y += MAX_HEAD_OFFSET; 1885 max_y += MAX_HEAD_OFFSET;
1912 } 1886 }
… …
1929 { 1903 {
1930 int i, got_one; 1904 int i, got_one;
1931 1905
1932 oldlen = sl.len; 1906 oldlen = sl.len;
1933 1907
1934 SockList_AddShort (&sl, mask); 1908 sl << uint16 (mask);
1935 1909
1936 if (check_head (sl, socket, ax, ay, 2)) 1910 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1937 mask |= 0x4;
1938 if (check_head (sl, socket, ax, ay, 1)) 1911 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1939 mask |= 0x2;
1940 if (check_head (sl, socket, ax, ay, 0)) 1912 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1941 mask |= 0x1;
1942 1913
1943 /* If all we are doing is sending 0 (blank) faces, we don't 1914 /* If all we are doing is sending 0 (blank) faces, we don't
1944 * actually need to send that - just the coordinates 1915 * actually need to send that - just the coordinates
1945 * with no faces tells the client to blank out the 1916 * with no faces tells the client to blank out the
1946 * space. 1917 * space.
1947 */ 1918 */
1948 got_one = 0; 1919 got_one = 0;
1949 for (i = oldlen + 2; i < sl.len; i++) 1920 for (i = oldlen + 2; i < sl.len; i++)
1950 {
1951 if (sl.buf[i]) 1921 if (sl.buf[i])
1952 got_one = 1; 1922 got_one = 1;
1953 }
1954 1923
1955 if (got_one && (mask & 0xf)) 1924 if (got_one && (mask & 0xf))
1956 {
1957 sl.buf[oldlen + 1] = mask & 0xff; 1925 sl.buf[oldlen + 1] = mask & 0xff;
1958 }
1959 else 1926 else
1960 { /*either all faces blank, either no face at all */ 1927 { /*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 */ 1928 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1962 sl.len = oldlen + 2; 1929 sl.len = oldlen + 2;
1963 else 1930 else
1964 sl.len = oldlen; 1931 sl.len = oldlen;
1965 } 1932 }
1933
1966 /*What concerns extendinfos, nothing to be done for now 1934 /*What concerns extendinfos, nothing to be done for now
1967 * (perhaps effects layer later) 1935 * (perhaps effects layer later)
1968 */ 1936 */
1969 continue; /* don't do processing below */ 1937 continue; /* don't do processing below */
1970 } 1938 }
1971 1939
1972 MapCell & lastcell = socket.lastmap.cells[ax][ay]; 1940 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1973 1941
1974 d = pl->contr->blocked_los[ax][ay]; 1942 d = pl->contr->blocked_los[ax][ay];
1975 1943
1976 /* If the coordinates are not valid, or it is too dark to see, 1944 /* If the coordinates are not valid, or it is too dark to see,
1977 * we tell the client as such 1945 * we tell the client as such
1978 */ 1946 */
1979 nx = x; 1947 nx = x;
1980 ny = y; 1948 ny = y;
1981 m = get_map_from_coord (pl->map, &nx, &ny); 1949 m = get_map_from_coord (pl->map, &nx, &ny);
1950
1982 if (!m) 1951 if (!m)
1983 { 1952 {
1984 /* space is out of map. Update space and clear values 1953 /* space is out of map. Update space and clear values
1985 * if this hasn't already been done. If the space is out 1954 * if this hasn't already been done. If the space is out
1986 * of the map, it shouldn't have a head 1955 * of the map, it shouldn't have a head
1987 */ 1956 */
1988 if (lastcell.count != -1) 1957 if (lastcell.count != -1)
1989 { 1958 {
1990 SockList_AddShort (&sl, mask); 1959 sl << uint16 (mask);
1991 map_clearcell (&lastcell, 0, 0, 0, -1); 1960 map_clearcell (&lastcell, 0, 0, 0, -1);
1992 } 1961 }
1993 } 1962 }
1994 else if (d > 3) 1963 else if (d > 3)
1995 { 1964 {
… …
1999 * reason. Still may need to send the head for this space. 1968 * reason. Still may need to send the head for this space.
2000 */ 1969 */
2001 1970
2002 oldlen = sl.len; 1971 oldlen = sl.len;
2003 1972
2004 SockList_AddShort (&sl, mask); 1973 sl << uint16 (mask);
1974
2005 if (lastcell.count != -1) 1975 if (lastcell.count != -1)
2006 need_send = 1; 1976 need_send = 1;
1977
2007 count = -1; 1978 count = -1;
2008 1979
2009 if (socket.mapmode == Map1aCmd && have_head (ax, ay)) 1980 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
2010 { 1981 {
2011 /* Now check to see if any heads need to be sent */ 1982 /* Now check to see if any heads need to be sent */
2012 1983
2013 if (check_head (sl, socket, ax, ay, 2)) 1984 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
2014 mask |= 0x4;
2015 if (check_head (sl, socket, ax, ay, 1)) 1985 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
2016 mask |= 0x2;
2017 if (check_head (sl, socket, ax, ay, 0)) 1986 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
2018 mask |= 0x1;
2019 1987
2020 lastcell.count = count; 1988 lastcell.count = count;
2021
2022 } 1989 }
2023 else 1990 else
2024 { 1991 {
2025 struct MapCell *cell = &lastcell;
2026
2027 /* properly clear a previously sent big face */ 1992 /* properly clear a previously sent big face */
2028 if (cell->faces[0] != 0 || cell->faces[1] != 0 || cell->faces[2] != 0) 1993 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0
1994 || lastcell.stat_hp || lastcell.flags || lastcell.player)
2029 need_send = 1; 1995 need_send = 1;
1996
2030 map_clearcell (&lastcell, 0, 0, 0, count); 1997 map_clearcell (&lastcell, 0, 0, 0, count);
2031 } 1998 }
2032 1999
2033 if ((mask & 0xf) || need_send) 2000 if ((mask & 0xf) || need_send)
2034 {
2035 sl.buf[oldlen + 1] = mask & 0xff; 2001 sl.buf[oldlen + 1] = mask & 0xff;
2036 }
2037 else 2002 else
2038 {
2039 sl.len = oldlen; 2003 sl.len = oldlen;
2040 }
2041 } 2004 }
2042 else 2005 else
2043 { 2006 {
2044 /* In this block, the space is visible or there are head objects 2007 /* In this block, the space is visible or there are head objects
2045 * we need to send. 2008 * we need to send.
… …
2057 */ 2020 */
2058 oldlen = sl.len; 2021 oldlen = sl.len;
2059 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 2022 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2060 eoldlen = esl.len; 2023 eoldlen = esl.len;
2061 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 2024 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2062 SockList_AddShort (&sl, mask); 2025 sl << uint16 (mask);
2063 2026
2064 if (socket.ext_mapinfos) 2027 if (socket.ext_mapinfos)
2065 SockList_AddShort (&esl, emask); 2028 esl << uint16 (emask);
2066 2029
2067 unsigned char dummy; 2030 unsigned char dummy;
2068 unsigned char *last_ext = &dummy; 2031 unsigned char *last_ext = &dummy;
2069 2032
2070 /* Darkness changed */ 2033 /* Darkness changed */
… …
2074 2037
2075 if (socket.extmap) 2038 if (socket.extmap)
2076 { 2039 {
2077 *last_ext |= 0x80; 2040 *last_ext |= 0x80;
2078 last_ext = sl.buf + sl.len; 2041 last_ext = sl.buf + sl.len;
2079 SockList_AddChar (&sl, d); 2042 sl << uint8 (d);
2080 } 2043 }
2081 else 2044 else
2082 SockList_AddChar (&sl, 255 - 64 * d); 2045 sl << uint8 (255 - 64 * d);
2083 } 2046 }
2084 2047
2085 lastcell.count = d; 2048 lastcell.count = d;
2086 2049
2087 if (socket.extmap) 2050 if (socket.extmap)
2088 { 2051 {
2089 uint8 stat_hp = 0; 2052 uint8 stat_hp = 0;
2090 uint8 stat_width = 0; 2053 uint8 stat_width = 0;
2054 uint8 flags = 0;
2091 tag_t player = 0; 2055 UUID player = 0;
2092 2056
2093 // send hp information, if applicable 2057 // send hp information, if applicable
2094 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 2058 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))
2095 { 2059 {
2096 if (op->head || op->invisible) 2060 if (op->head || op->invisible)
… …
2103 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 2067 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
2104 stat_width = op->arch->tail_x; 2068 stat_width = op->arch->tail_x;
2105 } 2069 }
2106 } 2070 }
2107 2071
2072 if (op->msg && op->msg[0] == '@')
2073 flags |= 1;
2074
2108 if (op->type == PLAYER && op != pl) 2075 if (op->type == PLAYER && op != pl)
2109 player = op->count; 2076 player = op->count;
2110 } 2077 }
2111 2078
2112 if (lastcell.stat_hp != stat_hp) 2079 if (lastcell.stat_hp != stat_hp)
… …
2114 lastcell.stat_hp = stat_hp; 2081 lastcell.stat_hp = stat_hp;
2115 2082
2116 mask |= 0x8; 2083 mask |= 0x8;
2117 *last_ext |= 0x80; 2084 *last_ext |= 0x80;
2118 last_ext = sl.buf + sl.len; 2085 last_ext = sl.buf + sl.len;
2119 SockList_AddChar (&sl, 5); 2086
2120 SockList_AddChar (&sl, stat_hp); 2087 sl << uint8 (5) << uint8 (stat_hp);
2121 2088
2122 if (stat_width > 1) 2089 if (stat_width > 1)
2123 { 2090 {
2124 *last_ext |= 0x80; 2091 *last_ext |= 0x80;
2125 last_ext = sl.buf + sl.len; 2092 last_ext = sl.buf + sl.len;
2126 SockList_AddChar (&sl, 6); 2093
2127 SockList_AddChar (&sl, stat_width); 2094 sl << uint8 (6) << uint8 (stat_width);
2128 } 2095 }
2129 } 2096 }
2130 2097
2131 if (lastcell.player != player) 2098 if (lastcell.player != player)
2132 { 2099 {
2133 lastcell.player = player; 2100 lastcell.player = player;
2134 2101
2135 mask |= 0x8; 2102 mask |= 0x8;
2136 *last_ext |= 0x80; 2103 *last_ext |= 0x80;
2137 last_ext = sl.buf + sl.len; 2104 last_ext = sl.buf + sl.len;
2138 SockList_AddChar (&sl, 0x47); 2105
2139 SockList_AddChar (&sl, 4); 2106 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2140 SockList_AddInt (&sl, player); 2107 }
2108
2109 if (lastcell.flags != flags)
2110 {
2111 lastcell.flags = flags;
2112
2113 mask |= 0x8;
2114 *last_ext |= 0x80;
2115 last_ext = sl.buf + sl.len;
2116
2117 sl << uint8 (8) << uint8 (flags);
2141 } 2118 }
2142 } 2119 }
2143 2120
2144 /* Floor face */ 2121 /* Floor face */
2145 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 2)) 2122 if (update_space (sl, socket, m, nx, ny, ax, ay, 2))
2146 mask |= 0x4; 2123 mask |= 0x4;
2147 2124
2148 if (socket.EMI_smooth) 2125 if (socket.EMI_smooth)
2149 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 2)) 2126 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
2150 emask |= 0x4; 2127 emask |= 0x4;
2151 2128
2152 /* Middle face */ 2129 /* Middle face */
2153 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 1)) 2130 if (update_space (sl, socket, m, nx, ny, ax, ay, 1))
2154 mask |= 0x2; 2131 mask |= 0x2;
2155 2132
2156 if (socket.EMI_smooth) 2133 if (socket.EMI_smooth)
2157 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 1)) 2134 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
2158 emask |= 0x2; 2135 emask |= 0x2;
2159 2136
2160 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) 2137 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
2161 { 2138 {
2162 if (lastcell.faces[0] != pl->face->number) 2139 if (lastcell.faces[0] != pl->face->number)
2163 { 2140 {
2164 lastcell.faces[0] = pl->face->number; 2141 lastcell.faces[0] = pl->face->number;
2165 mask |= 0x1; 2142 mask |= 0x1;
2143
2166 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 2144 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
2167 esrv_send_face (&socket, pl->face->number, 0); 2145 esrv_send_face (&socket, pl->face->number, 0);
2168 SockList_AddShort (&sl, pl->face->number); 2146
2147 sl << uint16 (pl->face->number);
2169 } 2148 }
2170 } 2149 }
2171 /* Top face */
2172 else 2150 else
2173 { 2151 {
2152 /* Top face */
2174 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 0)) 2153 if (update_space (sl, socket, m, nx, ny, ax, ay, 0))
2175 mask |= 0x1; 2154 mask |= 0x1;
2155
2176 if (socket.EMI_smooth) 2156 if (socket.EMI_smooth)
2177 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 0)) 2157 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
2178 {
2179 emask |= 0x1; 2158 emask |= 0x1;
2180 }
2181 } 2159 }
2160
2182 /* Check to see if we are in fact sending anything for this 2161 /* Check to see if we are in fact sending anything for this
2183 * space by checking the mask. If so, update the mask. 2162 * space by checking the mask. If so, update the mask.
2184 * if not, reset the len to that from before adding the mask 2163 * if not, reset the len to that from before adding the mask
2185 * value, so we don't send those bits. 2164 * value, so we don't send those bits.
2186 */ 2165 */
2187 if (mask & 0xf) 2166 if (mask & 0xf)
2188 {
2189 sl.buf[oldlen + 1] = mask & 0xff; 2167 sl.buf[oldlen + 1] = mask & 0xff;
2190 }
2191 else 2168 else
2192 {
2193 sl.len = oldlen; 2169 sl.len = oldlen;
2194 } 2170
2195 if (emask & 0xf) 2171 if (emask & 0xf)
2196 {
2197 esl.buf[eoldlen + 1] = emask & 0xff; 2172 esl.buf[eoldlen + 1] = emask & 0xff;
2198 }
2199 else 2173 else
2200 {
2201 esl.len = eoldlen; 2174 esl.len = eoldlen;
2202 }
2203 } /* else this is a viewable space */ 2175 } /* else this is a viewable space */
2204 } /* for x loop */ 2176 } /* for x loop */
2205 } /* for y loop */ 2177 } /* for y loop */
2206 2178
2207 /* Verify that we in fact do need to send this */ 2179 /* Verify that we in fact do need to send this */
… …
2216 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 2188 esl.buf[ewhatstart + 1] = ewhatflag & 0xff;
2217 } 2189 }
2218 2190
2219 if (esl.len > estartlen) 2191 if (esl.len > estartlen)
2220 Send_With_Handling (&socket, &esl); 2192 Send_With_Handling (&socket, &esl);
2221
2222 free (esl.buf);
2223 } 2193 }
2224 2194
2225 if (sl.len > startlen || socket.sent_scroll) 2195 if (sl.len > startlen || socket.sent_scroll)
2226 { 2196 {
2227 Send_With_Handling (&socket, &sl); 2197 Send_With_Handling (&socket, &sl);
2228 socket.sent_scroll = 0; 2198 socket.sent_scroll = 0;
2229 } 2199 }
2230 2200
2231 free (sl.buf); 2201 sl.free ();
2202 esl.free ();
2232} 2203}
2233 2204
2234/** 2205/**
2235 * Draws client map. 2206 * Draws client map.
2236 */ 2207 */
… …
2350 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap); 2321 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap);
2351 } 2322 }
2352 } /* Is a valid space */ 2323 } /* Is a valid space */
2353 } 2324 }
2354 } 2325 }
2326
2355 esrv_map_doneredraw (&pl->contr->socket, &newmap); 2327 esrv_map_doneredraw (&pl->contr->socket, &newmap);
2356 2328
2357 check_map_change (pl->contr); 2329 check_map_change (pl->contr);
2358} 2330}
2359 2331
… …
2376/** 2348/**
2377 * This sends the skill number to name mapping. We ignore 2349 * This sends the skill number to name mapping. We ignore
2378 * the params - we always send the same info no matter what. 2350 * the params - we always send the same info no matter what.
2379 */ 2351 */
2380void 2352void
2381send_skill_info (NewSocket * ns, char *params) 2353send_skill_info (NewSocket *ns, char *params)
2382{ 2354{
2383 SockList sl; 2355 SockList sl (MAXSOCKBUF);
2384 int i; 2356 sl << "replyinfo skill_info\n";
2385 2357
2386 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
2387 strcpy ((char *) sl.buf, "replyinfo skill_info\n");
2388 for (i = 1; i < NUM_SKILLS; i++) 2358 for (int i = 1; i < NUM_SKILLS; i++)
2389 {
2390 sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 2359 sl.len += sprintf ((char *)sl.buf + sl.len, "%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2391 } 2360
2392 sl.len = strlen ((char *) sl.buf);
2393 if (sl.len >= MAXSOCKBUF) 2361 if (sl.len >= MAXSOCKBUF)
2394 { 2362 {
2395 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2363 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2396 fatal (0); 2364 fatal (0);
2397 } 2365 }
2366
2398 Send_With_Handling (ns, &sl); 2367 Send_With_Handling (ns, &sl);
2399 free (sl.buf); 2368 sl.free ();
2400} 2369}
2401 2370
2402/** 2371/**
2403 * This sends the spell path to name mapping. We ignore 2372 * This sends the spell path to name mapping. We ignore
2404 * the params - we always send the same info no matter what. 2373 * the params - we always send the same info no matter what.
2405 */ 2374 */
2406void 2375void
2407send_spell_paths (NewSocket * ns, char *params) 2376send_spell_paths (NewSocket * ns, char *params)
2408{ 2377{
2409 SockList sl; 2378 SockList sl (MAXSOCKBUF);
2410 int i;
2411 2379
2412 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2380 sl << "replyinfo spell_paths\n";
2413 strcpy ((char *) sl.buf, "replyinfo spell_paths\n"); 2381
2414 for (i = 0; i < NRSPELLPATHS; i++) 2382 for (int i = 0; i < NRSPELLPATHS; i++)
2415 sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", 1 << i, spellpathnames[i]); 2383 sl.len += sprintf ((char *)sl.buf + sl.len, "%d:%s\n", 1 << i, spellpathnames[i]);
2416 sl.len = strlen ((char *) sl.buf); 2384
2417 if (sl.len >= MAXSOCKBUF) 2385 if (sl.len >= MAXSOCKBUF)
2418 { 2386 {
2419 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2387 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2420 fatal (0); 2388 fatal (0);
2421 } 2389 }
2390
2422 Send_With_Handling (ns, &sl); 2391 Send_With_Handling (ns, &sl);
2423 free (sl.buf); 2392 sl.free ();
2424} 2393}
2425 2394
2426/** 2395/**
2427 * This looks for any spells the player may have that have changed their stats. 2396 * 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 2397 * it then sends an updspell packet for each spell that has changed in this way
2429 */ 2398 */
2430void 2399void
2431esrv_update_spells (player *pl) 2400esrv_update_spells (player *pl)
2432{ 2401{
2433 SockList sl;
2434 int flags = 0;
2435 object *spell;
2436
2437 if (!pl->socket.monitor_spells) 2402 if (!pl->socket.monitor_spells)
2438 return; 2403 return;
2404
2439 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2405 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2440 { 2406 {
2441 if (spell->type == SPELL) 2407 if (spell->type == SPELL)
2442 { 2408 {
2409 int flags = 0;
2410
2443 /* check if we need to update it */ 2411 /* check if we need to update it */
2444 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 2412 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
2445 { 2413 {
2446 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 2414 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2447 flags |= UPD_SP_MANA; 2415 flags |= UPD_SP_MANA;
2448 } 2416 }
2417
2449 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 2418 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
2450 { 2419 {
2451 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 2420 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2452 flags |= UPD_SP_GRACE; 2421 flags |= UPD_SP_GRACE;
2453 } 2422 }
2423
2454 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 2424 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
2455 { 2425 {
2456 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 2426 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2457 flags |= UPD_SP_DAMAGE; 2427 flags |= UPD_SP_DAMAGE;
2458 } 2428 }
2429
2459 if (flags != 0) 2430 if (flags)
2460 { 2431 {
2461 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2432 SockList sl (MAXSOCKBUF);
2462 strcpy ((char *) sl.buf, "updspell "); 2433
2463 sl.len = strlen ((char *) sl.buf); 2434 sl << "updspell "
2464 SockList_AddChar (&sl, flags); 2435 << uint8 (flags)
2465 SockList_AddInt (&sl, spell->count); 2436 << uint32 (spell->count);
2466 if (flags & UPD_SP_MANA) 2437
2467 SockList_AddShort (&sl, spell->last_sp); 2438 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2468 if (flags & UPD_SP_GRACE) 2439 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2469 SockList_AddShort (&sl, spell->last_grace); 2440 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2470 if (flags & UPD_SP_DAMAGE) 2441
2471 SockList_AddShort (&sl, spell->last_eat);
2472 flags = 0;
2473 Send_With_Handling (&pl->socket, &sl); 2442 Send_With_Handling (&pl->socket, &sl);
2474 free (sl.buf); 2443 sl.free ();
2475 } 2444 }
2476 } 2445 }
2477 } 2446 }
2478} 2447}
2479 2448
2480void 2449void
2481esrv_remove_spell (player *pl, object *spell) 2450esrv_remove_spell (player *pl, object *spell)
2482{ 2451{
2483 SockList sl;
2484
2485 if (!pl->socket.monitor_spells) 2452 if (!pl->socket.monitor_spells)
2486 return; 2453 return;
2454
2487 if (!pl || !spell || spell->env != pl->ob) 2455 if (!pl || !spell || spell->env != pl->ob)
2488 { 2456 {
2489 LOG (llevError, "Invalid call to esrv_remove_spell"); 2457 LOG (llevError, "Invalid call to esrv_remove_spell");
2490 return; 2458 return;
2491 } 2459 }
2492 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2460
2493 strcpy ((char *) sl.buf, "delspell "); 2461 SockList sl (MAXSOCKBUF);
2494 sl.len = strlen ((char *) sl.buf); 2462
2495 SockList_AddInt (&sl, spell->count); 2463 sl << "delspell "
2464 << uint32 (spell->count);
2465
2496 Send_With_Handling (&pl->socket, &sl); 2466 Send_With_Handling (&pl->socket, &sl);
2497 free (sl.buf); 2467 sl.free ();
2498} 2468}
2499 2469
2500/* appends the spell *spell to the Socklist we will send the data to. */ 2470/* appends the spell *spell to the Socklist we will send the data to. */
2501static void 2471static void
2502append_spell (player *pl, SockList * sl, object *spell) 2472append_spell (player *pl, SockList &sl, object *spell)
2503{ 2473{
2504 int len, i, skill = 0; 2474 int len, i, skill = 0;
2505 2475
2506 if (!(spell->name)) 2476 if (!(spell->name))
2507 { 2477 {
2508 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 2478 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2509 return; 2479 return;
2510 } 2480 }
2511 SockList_AddInt (sl, spell->count); 2481
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 */ 2482 /* 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); 2483 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); 2484 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); 2485 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 2486
2523 /* figure out which skill it uses, if it uses one */ 2487 /* figure out which skill it uses, if it uses one */
2524 if (spell->skill) 2488 if (spell->skill)
2525 { 2489 {
2526 for (i = 1; i < NUM_SKILLS; i++) 2490 for (i = 1; i < NUM_SKILLS; i++)
… …
2528 { 2492 {
2529 skill = i + CS_STAT_SKILLINFO; 2493 skill = i + CS_STAT_SKILLINFO;
2530 break; 2494 break;
2531 } 2495 }
2532 } 2496 }
2533 SockList_AddChar (sl, skill);
2534 2497
2535 SockList_AddInt (sl, spell->path_attuned); 2498 /* send the current values */
2499 sl << uint32 (spell->count)
2500 << uint16 (spell->level)
2501 << uint16 (spell->casting_time)
2502 << uint16 (spell->last_sp)
2503 << uint16 (spell->last_grace)
2504 << uint16 (spell->last_eat)
2505 << uint8 (skill)
2506 << uint32 (spell->path_attuned)
2536 SockList_AddInt (sl, (spell->face) ? spell->face->number : 0); 2507 << uint32 (spell->face ? spell->face->number : 0)
2537 2508 << data8 (spell->name)
2538 len = strlen (spell->name); 2509 << 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} 2510}
2555 2511
2556/** 2512/**
2557 * This tells the client to add the spell *ob, if *ob is NULL, then add 2513 * This tells the client to add the spell *ob, if *ob is NULL, then add
2558 * all spells in the player's inventory. 2514 * all spells in the player's inventory.
2559 */ 2515 */
2560void 2516void
2561esrv_add_spells (player *pl, object *spell) 2517esrv_add_spells (player *pl, object *spell)
2562{ 2518{
2563 SockList sl;
2564
2565 if (!pl) 2519 if (!pl)
2566 { 2520 {
2567 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2521 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2568 return; 2522 return;
2569 } 2523 }
2524
2570 if (!pl->socket.monitor_spells) 2525 if (!pl->socket.monitor_spells)
2571 return; 2526 return;
2572 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2527
2573 strcpy ((char *) sl.buf, "addspell "); 2528 SockList sl (MAXSOCKBUF);
2574 sl.len = strlen ((char *) sl.buf); 2529
2530 sl << "addspell ";
2531
2575 if (!spell) 2532 if (!spell)
2576 { 2533 {
2577 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2534 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2578 { 2535 {
2579 /* were we to simply keep appending data here, we could exceed 2536 /* 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 2546 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2590 * like it will fix this 2547 * like it will fix this
2591 */ 2548 */
2592 if (spell->type != SPELL) 2549 if (spell->type != SPELL)
2593 continue; 2550 continue;
2551
2594 if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2552 if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2595 { 2553 {
2596 Send_With_Handling (&pl->socket, &sl); 2554 Send_With_Handling (&pl->socket, &sl);
2597 strcpy ((char *) sl.buf, "addspell "); 2555 strcpy ((char *) sl.buf, "addspell ");
2598 sl.len = strlen ((char *) sl.buf); 2556 sl.len = strlen ((char *) sl.buf);
2599 } 2557 }
2558
2600 append_spell (pl, &sl, spell); 2559 append_spell (pl, sl, spell);
2601 } 2560 }
2602 } 2561 }
2603 else if (spell->type != SPELL) 2562 else if (spell->type != SPELL)
2604 { 2563 {
2605 LOG (llevError, "Asked to send a non-spell object as a spell"); 2564 LOG (llevError, "Asked to send a non-spell object as a spell");
2606 return; 2565 return;
2607 } 2566 }
2608 else 2567 else
2609 append_spell (pl, &sl, spell); 2568 append_spell (pl, sl, spell);
2569
2610 if (sl.len >= MAXSOCKBUF) 2570 if (sl.length () >= MAXSOCKBUF)
2611 { 2571 {
2612 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2572 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2613 fatal (0); 2573 fatal (0);
2614 } 2574 }
2575
2615 /* finally, we can send the packet */ 2576 /* finally, we can send the packet */
2616 Send_With_Handling (&pl->socket, &sl); 2577 Send_With_Handling (&pl->socket, &sl);
2617 free (sl.buf); 2578
2579 sl.free ();
2618} 2580}
2581

Diff Legend

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