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.17 by root, Tue Sep 12 19:20:09 2006 UTC vs.
Revision 1.28 by root, Wed Dec 13 18:51:50 2006 UTC

1
2/*
3 * static char *rcsid_init_c =
4 * "$Id: request.C,v 1.17 2006/09/12 19:20:09 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.
… …
50 * operations 44 * operations
51 * 45 *
52 * esrv_map_doneredraw finishes the map update, and ships across the 46 * esrv_map_doneredraw finishes the map update, and ships across the
53 * map updates. 47 * map updates.
54 * 48 *
55 * esrv_map_scroll tells the client to scroll the map, and does similarily
56 * for the locally cached copy.
57 */ 49 */
58 50
59#include <global.h> 51#include <global.h>
60#include <sproto.h> 52#include <sproto.h>
61 53
… …
65#include <commands.h> 57#include <commands.h>
66 58
67/* 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,
68 * it should work here. 60 * it should work here.
69 */ 61 */
70#ifndef WIN32 /* ---win32 exclude unix headers */
71# include <sys/types.h> 62#include <sys/types.h>
72# include <sys/time.h> 63#include <sys/time.h>
73# include <sys/socket.h> 64#include <sys/socket.h>
74# include <netinet/in.h> 65#include <netinet/in.h>
75# include <netdb.h> 66#include <netdb.h>
76#endif /* win32 */
77 67
78#ifdef HAVE_UNISTD_H 68#ifdef HAVE_UNISTD_H
79# include <unistd.h> 69# include <unistd.h>
80#endif 70#endif
81 71
… …
145 for (x = 0; x < mx; x++) 135 for (x = 0; x < mx; x++)
146 { 136 {
147 for (y = 0; y < my; y++) 137 for (y = 0; y < my; y++)
148 { 138 {
149 if (x >= ns->mapx || y >= ns->mapy) 139 if (x >= ns->mapx || y >= ns->mapy)
150 {
151 /* clear cells outside the viewable area */ 140 /* clear cells outside the viewable area */
152 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 141 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
153 }
154 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)
155 {
156 /* clear newly visible tiles within the viewable area */ 143 /* clear newly visible tiles within the viewable area */
157 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 144 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
158 }
159 else 145 else
160 {
161 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));
162 }
163 } 147 }
164 } 148 }
165 149
166 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 150 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
167 151
… …
266 if (!strncmp (buf, "spatial ", 8)) 250 if (!strncmp (buf, "spatial ", 8))
267 { 251 {
268 buf += 8; 252 buf += 8;
269 253
270 // initial map and its origin 254 // initial map and its origin
271 mapstruct *map = pl->ob->map; 255 maptile *map = pl->ob->map;
272 sint16 dx, dy; 256 sint16 dx, dy;
273 int mapx = pl->socket.mapx / 2 - pl->ob->x; 257 int mapx = pl->socket.mapx / 2 - pl->ob->x;
274 int mapy = pl->socket.mapy / 2 - pl->ob->y; 258 int mapy = pl->socket.mapy / 2 - pl->ob->y;
275 int max_distance = 8; // limit maximum path length to something generous 259 int max_distance = 8; // limit maximum path length to something generous
276 260
… …
698 */ 682 */
699static void 683static void
700SendSmooth (NewSocket * ns, uint16 face) 684SendSmooth (NewSocket * ns, uint16 face)
701{ 685{
702 uint16 smoothface; 686 uint16 smoothface;
703 unsigned char reply[MAX_BUF];
704 SockList sl;
705 687
706 /* 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
707 * again. 689 * again.
708 */ 690 */
709 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 691 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
… …
717 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 699 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
718 esrv_send_face (ns, smoothface, 0); 700 esrv_send_face (ns, smoothface, 0);
719 701
720 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 702 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
721 703
722 sl.buf = reply; 704 SockList sl (MAXSOCKBUF);
723 strcpy ((char *) sl.buf, "smooth "); 705
724 sl.len = strlen ((char *) sl.buf); 706 sl << "smooth "
725 SockList_AddShort (&sl, face); 707 << uint16 (face)
726 SockList_AddShort (&sl, smoothface); 708 << uint16 (smoothface);
709
727 Send_With_Handling (ns, &sl); 710 Send_With_Handling (ns, &sl);
711 sl.free ();
728} 712}
729 713
730 /** 714 /**
731 * Tells client the picture it has to use 715 * Tells client the picture it has to use
732 * to smooth a picture number given as argument. 716 * to smooth a picture number given as argument.
… …
738 722
739 facenbr = atoi (buf); 723 facenbr = atoi (buf);
740 SendSmooth (ns, facenbr); 724 SendSmooth (ns, facenbr);
741} 725}
742 726
743
744
745
746
747/** 727/**
748 * 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,
749 * etc.) 729 * etc.)
750 */ 730 */
751void 731void
… …
804 */ 784 */
805void 785void
806NewPlayerCmd (uint8 * buf, int len, player *pl) 786NewPlayerCmd (uint8 * buf, int len, player *pl)
807{ 787{
808 int time, repeat; 788 int time, repeat;
789 char command[MAX_BUF];
809 short packet; 790 short packet;
810 unsigned char command[MAX_BUF];
811 SockList sl;
812 791
813 if (len < 7) 792 if (len < 7)
814 { 793 {
815 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);
816 return; 795 return;
… …
818 797
819 packet = GetShort_String (buf); 798 packet = GetShort_String (buf);
820 repeat = GetInt_String (buf + 2); 799 repeat = GetInt_String (buf + 2);
821 /* -1 is special - no repeat, but don't update */ 800 /* -1 is special - no repeat, but don't update */
822 if (repeat != -1) 801 if (repeat != -1)
823 {
824 pl->count = repeat; 802 pl->count = repeat;
825 } 803
826 if ((len - 4) >= MAX_BUF) 804 if ((len - 4) >= MAX_BUF)
827 len = MAX_BUF - 5; 805 len = MAX_BUF - 5;
828 806
829 strncpy ((char *) command, (char *) buf + 6, len - 4); 807 strncpy ((char *) command, (char *) buf + 6, len - 4);
830 command[len - 4] = '\0'; 808 command[len - 4] = '\0';
… …
840 return; 818 return;
841 } 819 }
842 820
843 /* This should not happen anymore. */ 821 /* This should not happen anymore. */
844 if (pl->ob->speed_left < -1.0) 822 if (pl->ob->speed_left < -1.0)
845 {
846 LOG (llevError, "Player has negative time - shouldn't do command.\n"); 823 LOG (llevError, "Player has negative time - shouldn't do command.\n");
847 } 824
848 /* In c_new.c */ 825 /* In c_new.c */
849 execute_newserver_command (pl->ob, (char *) command); 826 execute_newserver_command (pl->ob, (char *) command);
850 /* Perhaps something better should be done with a left over count. 827 /* Perhaps something better should be done with a left over count.
851 * Cleaning up the input should probably be done first - all actions 828 * Cleaning up the input should probably be done first - all actions
852 * 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
853 * commands. 830 * commands.
854 */ 831 */
855 pl->count = 0; 832 pl->count = 0;
856 833
857 /* Send confirmation of command execution now */
858 sl.buf = command;
859 strcpy ((char *) sl.buf, "comc ");
860 sl.len = 5;
861 SockList_AddShort (&sl, packet);
862 if (FABS (pl->ob->speed) < 0.001) 834 if (FABS (pl->ob->speed) < 0.001)
863 time = MAX_TIME * 100; 835 time = MAX_TIME * 100;
864 else 836 else
865 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 837 time = (int) (MAX_TIME / FABS (pl->ob->speed));
866 SockList_AddInt (&sl, time); 838
839 /* Send confirmation of command execution now */
840
841 SockList sl (MAXSOCKBUF);
842 sl << "comc " << uint16 (packet) << uint32 (time);
867 Send_With_Handling (&pl->socket, &sl); 843 Send_With_Handling (&pl->socket, &sl);
844 sl.free ();
868} 845}
869 846
870 847
871/** This is a reply to a previous query. */ 848/** This is a reply to a previous query. */
872void 849void
… …
1075 Write_String_To_Socket (ns, buf, strlen (buf)); 1052 Write_String_To_Socket (ns, buf, strlen (buf));
1076} 1053}
1077 1054
1078#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1055#define AddIfInt64(Old,New,Type) if (Old != New) {\
1079 Old = New; \ 1056 Old = New; \
1080 SockList_AddChar(&sl, Type); \ 1057 sl << uint8 (Type) << uint64 (New); \
1081 SockList_AddInt64(&sl, New); \
1082 } 1058 }
1083 1059
1084#define AddIfInt(Old,New,Type) if (Old != New) {\ 1060#define AddIfInt(Old,New,Type) if (Old != New) {\
1085 Old = New; \ 1061 Old = New; \
1086 SockList_AddChar(&sl, Type); \ 1062 sl << uint8 (Type) << uint32 (New); \
1087 SockList_AddInt(&sl, New); \
1088 } 1063 }
1089 1064
1090#define AddIfShort(Old,New,Type) if (Old != New) {\ 1065#define AddIfShort(Old,New,Type) if (Old != New) {\
1091 Old = New; \ 1066 Old = New; \
1092 SockList_AddChar(&sl, Type); \ 1067 sl << uint8 (Type) << uint16 (New); \
1093 SockList_AddShort(&sl, New); \
1094 } 1068 }
1095 1069
1096#define AddIfFloat(Old,New,Type) if (Old != New) {\ 1070#define AddIfFloat(Old,New,Type) if (Old != New) {\
1097 Old = New; \ 1071 Old = New; \
1098 SockList_AddChar(&sl, Type); \ 1072 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \
1099 SockList_AddInt(&sl,(long)(New*FLOAT_MULTI));\
1100 } 1073 }
1101 1074
1102#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 1075#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1103 if (Old) free(Old);\
1104 Old = strdup_local(New);\ 1076 free(Old); Old = strdup (New);\
1105 SockList_AddChar(&sl, Type); \ 1077 sl << uint8 (Type) << data8 (New); \
1106 SockList_AddChar(&sl, ( char )strlen(New)); \
1107 strcpy((char*)sl.buf + sl.len, New); \
1108 sl.len += strlen(New); \
1109 } 1078 }
1110 1079
1111/** 1080/**
1112 * Sends a statistics update. We look at the old values, 1081 * Sends a statistics update. We look at the old values,
1113 * 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
… …
1115 * commands for now. 1084 * commands for now.
1116 */ 1085 */
1117void 1086void
1118esrv_update_stats (player *pl) 1087esrv_update_stats (player *pl)
1119{ 1088{
1120 SockList sl;
1121 char buf[MAX_BUF]; 1089 char buf[MAX_BUF];
1122 uint16 flags; 1090 uint16 flags;
1123 1091
1124 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1092 SockList sl (MAXSOCKBUF);
1125 strcpy ((char *) sl.buf, "stats "); 1093 sl << "stats ";
1126 sl.len = strlen ((char *) sl.buf);
1127 1094
1128 if (pl->ob != NULL) 1095 if (pl->ob != NULL)
1129 { 1096 {
1130 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);
1131 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);
… …
1139 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);
1140 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);
1141 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);
1142 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);
1143 } 1110 }
1111
1144 if (pl->socket.exp64) 1112 if (pl->socket.exp64)
1145 { 1113 {
1146 uint8 s; 1114 uint8 s;
1147 1115
1148 for (s = 0; s < NUM_SKILLS; s++) 1116 for (s = 0; s < NUM_SKILLS; s++)
1149 { 1117 {
1150 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)
1151 { 1119 {
1152
1153 /* Always send along the level if exp changes. This is only 1120 /* Always send along the level if exp changes. This is only
1154 * 1 extra byte, but keeps processing simpler. 1121 * 1 extra byte, but keeps processing simpler.
1155 */ 1122 */
1156 SockList_AddChar (&sl, (char) (s + CS_STAT_SKILLINFO)); 1123 sl << uint8 (s + CS_STAT_SKILLINFO)
1157 SockList_AddChar (&sl, (char) pl->last_skill_ob[s]->level); 1124 << uint8 (pl->last_skill_ob[s]->level)
1158 SockList_AddInt64 (&sl, pl->last_skill_ob[s]->stats.exp); 1125 << uint64 (pl->last_skill_ob[s]->stats.exp);
1126
1159 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;
1160 } 1128 }
1161 } 1129 }
1162 } 1130 }
1131
1163 if (pl->socket.exp64) 1132 if (pl->socket.exp64)
1164 {
1165 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) }
1166 }
1167 else 1134 else
1168 {
1169 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) }
1170 } 1136
1171 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1137 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
1172 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);
1173 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);
1174 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);
1175 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1141 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
1176 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);
1177 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);
1178 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);
1179 flags = 0; 1145 flags = 0;
1146
1180 if (pl->fire_on) 1147 if (pl->fire_on)
1181 flags |= SF_FIREON; 1148 flags |= SF_FIREON;
1149
1182 if (pl->run_on) 1150 if (pl->run_on)
1183 flags |= SF_RUNON; 1151 flags |= SF_RUNON;
1184 1152
1185 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1153 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1154
1186 if (pl->socket.sc_version < 1025) 1155 if (pl->socket.sc_version < 1025)
1187 {
1188 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) }
1189 }
1190 else 1157 else
1191 { 1158 {
1192 int i; 1159 int i;
1193 1160
1194 for (i = 0; i < NROFATTACKS; i++) 1161 for (i = 0; i < NROFATTACKS; i++)
1195 { 1162 {
1196 /* Skip ones we won't send */ 1163 /* Skip ones we won't send */
1197 if (atnr_cs_stat[i] == -1) 1164 if (atnr_cs_stat[i] == -1)
1198 continue; 1165 continue;
1166
1199 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]);
1200 } 1168 }
1201 } 1169 }
1170
1202 if (pl->socket.monitor_spells) 1171 if (pl->socket.monitor_spells)
1203 { 1172 {
1204 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);
1205 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);
1206 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);
1207 } 1176 }
1177
1208 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 */
1209 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); 1179 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE);
1210 set_title (pl->ob, buf); 1180 set_title (pl->ob, buf);
1211 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1181 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE);
1212 1182
… …
1216#ifdef ESRV_DEBUG 1186#ifdef ESRV_DEBUG
1217 LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len); 1187 LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len);
1218#endif 1188#endif
1219 Send_With_Handling (&pl->socket, &sl); 1189 Send_With_Handling (&pl->socket, &sl);
1220 } 1190 }
1221 free (sl.buf);
1222}
1223 1191
1192 sl.free ();
1193}
1224 1194
1225/** 1195/**
1226 * 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.
1227 */ 1197 */
1228void 1198void
1229esrv_new_player (player *pl, uint32 weight) 1199esrv_new_player (player *pl, uint32 weight)
1230{ 1200{
1231 SockList sl;
1232
1233 pl->last_weight = weight; 1201 pl->last_weight = weight;
1234 1202
1235 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1203 SockList sl (MAXSOCKBUF);
1204 sl << "player ";
1236 1205
1237 strcpy ((char *) sl.buf, "player "); 1206 sl << uint32 (pl->ob->count)
1238 sl.len = strlen ((char *) sl.buf); 1207 << uint32 (weight)
1239 SockList_AddInt (&sl, pl->ob->count); 1208 << uint32 (pl->ob->face->number)
1240 SockList_AddInt (&sl, weight); 1209 << data8 (pl->ob->name);
1241 SockList_AddInt (&sl, pl->ob->face->number);
1242
1243 SockList_AddChar (&sl, (char) strlen (pl->ob->name));
1244 strcpy ((char *) sl.buf + sl.len, pl->ob->name);
1245 sl.len += strlen (pl->ob->name);
1246 1210
1247 Send_With_Handling (&pl->socket, &sl); 1211 Send_With_Handling (&pl->socket, &sl);
1248 free (sl.buf); 1212 sl.free ();
1249 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1213 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1250} 1214}
1251
1252 1215
1253/** 1216/**
1254 * Need to send an animation sequence to the client. 1217 * Need to send an animation sequence to the client.
1255 * 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
1256 * 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
… …
1258 * when the player logs in and picks stuff up. 1221 * when the player logs in and picks stuff up.
1259 */ 1222 */
1260void 1223void
1261esrv_send_animation (NewSocket * ns, short anim_num) 1224esrv_send_animation (NewSocket * ns, short anim_num)
1262{ 1225{
1263 SockList sl;
1264 int i; 1226 int i;
1265 1227
1266 /* 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
1267 * 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
1268 * range, it must be a valid animation. 1230 * range, it must be a valid animation.
… …
1271 { 1233 {
1272 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);
1273 return; 1235 return;
1274 } 1236 }
1275 1237
1276 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1238 SockList sl (MAXSOCKBUF);
1277 strcpy ((char *) sl.buf, "anim "); 1239
1278 sl.len = 5; 1240 sl << "anim "
1279 SockList_AddShort (&sl, anim_num); 1241 << uint16 (anim_num)
1280 SockList_AddShort (&sl, 0); /* flags - not used right now */ 1242 << uint16 (0); /* flags - not used right now */
1243
1281 /* 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
1282 * the face itself) down to the client. 1245 * the face itself) down to the client.
1283 */ 1246 */
1284 for (i = 0; i < animations[anim_num].num_animations; i++) 1247 for (i = 0; i < animations[anim_num].num_animations; i++)
1285 { 1248 {
1286 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))
1287 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1250 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1288 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 */
1289 } 1252 }
1253
1290 Send_With_Handling (ns, &sl); 1254 Send_With_Handling (ns, &sl);
1291 free (sl.buf); 1255 sl.free ();
1256
1292 ns->anims_sent[anim_num] = 1; 1257 ns->anims_sent[anim_num] = 1;
1293} 1258}
1294 1259
1295 1260
1296/****************************************************************************** 1261/******************************************************************************
… …
1310 { 1275 {
1311 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);
1312 return; 1277 return;
1313 abort (); 1278 abort ();
1314 } 1279 }
1280
1315 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;
1316 newmap->cells[x][y].count++; 1282 newmap->cells[x][y].count++;
1283
1317 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1284 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1318 esrv_send_face (ns, face_num, 0); 1285 esrv_send_face (ns, face_num, 0);
1319} 1286}
1320 1287
1321struct LayerCell 1288struct LayerCell
… …
1428static void 1395static void
1429esrv_map_doneredraw (NewSocket * ns, struct Map *newmap) 1396esrv_map_doneredraw (NewSocket * ns, struct Map *newmap)
1430{ 1397{
1431 static long frames, bytes, tbytes, tframes; 1398 static long frames, bytes, tbytes, tframes;
1432 char *cur; 1399 char *cur;
1433 SockList sl;
1434 1400
1435 1401 SockList sl (MAXSOCKBUF);
1436 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1402 sl << "map ";
1437 strcpy ((char *) sl.buf, "map ");
1438 sl.len = strlen ((char *) sl.buf);
1439 1403
1440 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);
1441 sl.len = cur - (char *) sl.buf; 1405 sl.len = cur - (char *) sl.buf;
1442 1406
1443/* LOG(llevDebug, "Sending map command.\n");*/ 1407/* LOG(llevDebug, "Sending map command.\n");*/
1444 1408
1445 if (sl.len > (int) strlen ("map ") || ns->sent_scroll) 1409 if (sl.len > (int) strlen ("map ") || ns->sent_scroll)
1446 { 1410 {
1447 /* All of this is just accounting stuff */ 1411 /* All of this is just accounting stuff */
1448 if (tframes > 100) 1412 if (tframes > 100)
1449 {
1450 tframes = tbytes = 0; 1413 tframes = tbytes = 0;
1451 } 1414
1452 tframes++; 1415 tframes++;
1453 frames++; 1416 frames++;
1454 tbytes += sl.len; 1417 tbytes += sl.len;
1455 bytes += sl.len; 1418 bytes += sl.len;
1456 memcpy (&ns->lastmap, newmap, sizeof (struct Map)); 1419 memcpy (&ns->lastmap, newmap, sizeof (struct Map));
1457 Send_With_Handling (ns, &sl); 1420 Send_With_Handling (ns, &sl);
1458 ns->sent_scroll = 0; 1421 ns->sent_scroll = 0;
1459 } 1422 }
1460 free (sl.buf); 1423
1424 sl.free ();
1461} 1425}
1462 1426
1463 1427
1464/** Clears a map cell */ 1428/** Clears a map cell */
1465static void 1429static void
1466map_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)
1467{ 1431{
1468 cell->faces[0] = face0; 1432 cell->faces[0] = face0;
1469 cell->faces[1] = face1; 1433 cell->faces[1] = face1;
1470 cell->faces[2] = face2; 1434 cell->faces[2] = face2;
1471 cell->count = count; 1435 cell->count = count;
1472 cell->stat_hp = 0; 1436 cell->stat_hp = 0;
1437 cell->flags = 0;
1473 cell->player = 0; 1438 cell->player = 0;
1474} 1439}
1475 1440
1476#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) 1441#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1477#define MAX_LAYERS 3 1442#define MAX_LAYERS 3
1478 1443
… …
1506 * 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
1507 * 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
1508 * sent, it returns zero. 1473 * sent, it returns zero.
1509 */ 1474 */
1510static int 1475static int
1511check_head (SockList & sl, NewSocket & ns, int ax, int ay, int layer) 1476check_head (SockList &sl, NewSocket &ns, int ax, int ay, int layer)
1512{ 1477{
1513 short face_num; 1478 short face_num;
1514 1479
1515 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1480 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1516 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;
… …
1520 if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) 1485 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1521 { 1486 {
1522 SockList_AddShort (&sl, face_num); 1487 SockList_AddShort (&sl, face_num);
1523 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1488 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1524 esrv_send_face (&ns, face_num, 0); 1489 esrv_send_face (&ns, face_num, 0);
1490
1525 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; 1491 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1526 ns.lastmap.cells[ax][ay].faces[layer] = face_num; 1492 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1527 return 1; 1493 return 1;
1528 } 1494 }
1529 1495
… …
1549 * 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
1550 * actually match. 1516 * actually match.
1551 */ 1517 */
1552 1518
1553static int 1519static int
1554update_space (SockList * sl, NewSocket * ns, mapstruct *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)
1555{ 1521{
1556 object *ob, *head; 1522 object *ob, *head;
1557 uint16 face_num; 1523 uint16 face_num;
1558 int bx, by, i; 1524 int bx, by, i;
1559 1525
1560 /* 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.
1561 * If not, then do the normal processing. 1527 * If not, then do the normal processing.
1562 */ 1528 */
1563
1564 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; 1529 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1565 1530
1566 /* 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
1567 * we would normally send for this space. If so, then 1532 * we would normally send for this space. If so, then
1568 * 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
… …
1733 1698
1734 /* 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
1735 * 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
1736 * this one. 1701 * this one.
1737 */ 1702 */
1738 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)
1739 {
1740 face_num = 0; 1704 face_num = 0;
1741 }
1742 1705
1743 /* 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
1744 * 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.
1745 */ 1708 */
1746 if (ns->lastmap.cells[sx][sy].faces[layer] != face_num) 1709 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
1747 { 1710 {
1748 ns->lastmap.cells[sx][sy].faces[layer] = face_num; 1711 ns.lastmap.cells[sx][sy].faces[layer] = face_num;
1749 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1712 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1750 esrv_send_face (ns, face_num, 0); 1713 esrv_send_face (&ns, face_num, 0);
1751 SockList_AddShort (sl, face_num); 1714
1715 sl << uint16 (face_num);
1752 return 1; 1716 return 1;
1753 } 1717 }
1718
1754 /* Nothing changed */ 1719 /* Nothing changed */
1755 return 0; 1720 return 0;
1756} 1721}
1757 1722
1758/** 1723/**
… …
1773 * 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
1774 * take. 1739 * take.
1775 */ 1740 */
1776 1741
1777static inline int 1742static inline int
1778update_smooth (SockList * sl, NewSocket * ns, mapstruct *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)
1779{ 1744{
1780 object *ob; 1745 object *ob;
1781 int smoothlevel; /* old face_num; */ 1746 int smoothlevel; /* old face_num; */
1782 1747
1783 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1748 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1788 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1753 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1789 smoothlevel = 0; 1754 smoothlevel = 0;
1790 else 1755 else
1791 { 1756 {
1792 smoothlevel = ob->smoothlevel; 1757 smoothlevel = ob->smoothlevel;
1793 if (smoothlevel && !(ns->faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1758 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1794 SendSmooth (ns, ob->face->number); 1759 SendSmooth (&ns, ob->face->number);
1795 } /* else not already head object or blank face */ 1760 } /* else not already head object or blank face */
1796 1761
1797 /* 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
1798 * 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.
1799 */ 1764 */
1800 if (smoothlevel > 255) 1765 if (smoothlevel > 255)
1801 smoothlevel = 255; 1766 smoothlevel = 255;
1802 else if (smoothlevel < 0) 1767 else if (smoothlevel < 0)
1803 smoothlevel = 0; 1768 smoothlevel = 0;
1769
1804 if (ns->lastmap.cells[sx][sy].smooth[layer] != smoothlevel) 1770 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1805 { 1771 {
1806 ns->lastmap.cells[sx][sy].smooth[layer] = smoothlevel; 1772 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1807 SockList_AddChar (sl, (uint8) (smoothlevel & 0xFF)); 1773 sl << uint8 (smoothlevel);
1808 return 1; 1774 return 1;
1809 } 1775 }
1776
1810 /* Nothing changed */ 1777 /* Nothing changed */
1811 return 0; 1778 return 0;
1812} 1779}
1813 1780
1814/** 1781/**
… …
1855draw_client_map1 (object *pl) 1822draw_client_map1 (object *pl)
1856{ 1823{
1857 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;
1858 sint16 nx, ny; 1825 sint16 nx, ny;
1859 int estartlen, eoldlen; 1826 int estartlen, eoldlen;
1860 SockList sl;
1861 SockList esl; /*For extended Map info */
1862 uint16 mask, emask; 1827 uint16 mask, emask;
1863 uint8 eentrysize; 1828 uint8 eentrysize;
1864 uint16 ewhatstart, ewhatflag; 1829 uint16 ewhatstart, ewhatflag;
1865 uint8 extendedinfos; 1830 uint8 extendedinfos;
1866 mapstruct *m; 1831 maptile *m;
1867 1832
1868 NewSocket & socket = pl->contr->socket; 1833 NewSocket &socket = pl->contr->socket;
1869 1834
1870 check_map_change (pl->contr); 1835 check_map_change (pl->contr);
1871 1836
1872 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1837 SockList sl (MAXSOCKBUF);
1873 if (socket.mapmode == Map1Cmd) 1838 SockList esl (MAXSOCKBUF);
1874 strcpy ((char *) sl.buf, "map1 "); 1839
1875 else 1840 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1876 strcpy ((char *) sl.buf, "map1a ");
1877 sl.len = strlen ((char *) sl.buf);
1878 startlen = sl.len; 1841 startlen = sl.len;
1842
1879 /*Extendedmapinfo structure initialisation */ 1843 /*Extendedmapinfo structure initialisation */
1880 if (socket.ext_mapinfos) 1844 if (socket.ext_mapinfos)
1881 { 1845 {
1882 esl.buf = (unsigned char *) malloc (MAXSOCKBUF);
1883 strcpy ((char *) esl.buf, "mapextended ");
1884 esl.len = strlen ((char *) esl.buf);
1885 extendedinfos = EMI_NOREDRAW; 1846 extendedinfos = EMI_NOREDRAW;
1847
1886 if (socket.EMI_smooth) 1848 if (socket.EMI_smooth)
1887 extendedinfos |= EMI_SMOOTH; 1849 extendedinfos |= EMI_SMOOTH;
1850
1888 ewhatstart = esl.len; 1851 ewhatstart = esl.len;
1889 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1852 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1890 could need to be taken away */ 1853 could need to be taken away */
1891 SockList_AddChar (&esl, extendedinfos);
1892 eentrysize = getExtendedMapInfoSize (&socket); 1854 eentrysize = getExtendedMapInfoSize (&socket);
1893 SockList_AddChar (&esl, eentrysize); 1855 esl << "mapextended "
1856 << uint8 (extendedinfos)
1857 << uint8 (eentrysize);
1894 estartlen = esl.len; 1858 estartlen = esl.len;
1895 } 1859 }
1896 else 1860 else
1897 { 1861 {
1898 /* suppress compiler warnings */ 1862 /* suppress compiler warnings */
1899 ewhatstart = 0; 1863 ewhatstart = 0;
1900 ewhatflag = 0; 1864 ewhatflag = 0;
1901 estartlen = 0; 1865 estartlen = 0;
1902 } 1866 }
1867
1903 /* Init data to zero */ 1868 /* Init data to zero */
1904 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);
1905 1870
1906 /* 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
1907 * locations. 1872 * locations.
… …
1911 /* We could do this logic as conditionals in the if statement, 1876 /* We could do this logic as conditionals in the if statement,
1912 * but that started to get a bit messy to look at. 1877 * but that started to get a bit messy to look at.
1913 */ 1878 */
1914 max_x = pl->x + (socket.mapx + 1) / 2; 1879 max_x = pl->x + (socket.mapx + 1) / 2;
1915 max_y = pl->y + (socket.mapy + 1) / 2; 1880 max_y = pl->y + (socket.mapy + 1) / 2;
1881
1916 if (socket.mapmode == Map1aCmd) 1882 if (socket.mapmode == Map1aCmd)
1917 { 1883 {
1918 max_x += MAX_HEAD_OFFSET; 1884 max_x += MAX_HEAD_OFFSET;
1919 max_y += MAX_HEAD_OFFSET; 1885 max_y += MAX_HEAD_OFFSET;
1920 } 1886 }
… …
1937 { 1903 {
1938 int i, got_one; 1904 int i, got_one;
1939 1905
1940 oldlen = sl.len; 1906 oldlen = sl.len;
1941 1907
1942 SockList_AddShort (&sl, mask); 1908 sl << uint16 (mask);
1943 1909
1944 if (check_head (sl, socket, ax, ay, 2)) 1910 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1945 mask |= 0x4;
1946 if (check_head (sl, socket, ax, ay, 1)) 1911 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1947 mask |= 0x2;
1948 if (check_head (sl, socket, ax, ay, 0)) 1912 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1949 mask |= 0x1;
1950 1913
1951 /* 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
1952 * actually need to send that - just the coordinates 1915 * actually need to send that - just the coordinates
1953 * with no faces tells the client to blank out the 1916 * with no faces tells the client to blank out the
1954 * space. 1917 * space.
1955 */ 1918 */
1956 got_one = 0; 1919 got_one = 0;
1957 for (i = oldlen + 2; i < sl.len; i++) 1920 for (i = oldlen + 2; i < sl.len; i++)
1958 {
1959 if (sl.buf[i]) 1921 if (sl.buf[i])
1960 got_one = 1; 1922 got_one = 1;
1961 }
1962 1923
1963 if (got_one && (mask & 0xf)) 1924 if (got_one && (mask & 0xf))
1964 {
1965 sl.buf[oldlen + 1] = mask & 0xff; 1925 sl.buf[oldlen + 1] = mask & 0xff;
1966 }
1967 else 1926 else
1968 { /*either all faces blank, either no face at all */ 1927 { /*either all faces blank, either no face at all */
1969 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 */
1970 sl.len = oldlen + 2; 1929 sl.len = oldlen + 2;
1971 else 1930 else
1972 sl.len = oldlen; 1931 sl.len = oldlen;
1973 } 1932 }
1933
1974 /*What concerns extendinfos, nothing to be done for now 1934 /*What concerns extendinfos, nothing to be done for now
1975 * (perhaps effects layer later) 1935 * (perhaps effects layer later)
1976 */ 1936 */
1977 continue; /* don't do processing below */ 1937 continue; /* don't do processing below */
1978 } 1938 }
1979 1939
1980 MapCell & lastcell = socket.lastmap.cells[ax][ay]; 1940 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1981 1941
1982 d = pl->contr->blocked_los[ax][ay]; 1942 d = pl->contr->blocked_los[ax][ay];
1983 1943
1984 /* 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,
1985 * we tell the client as such 1945 * we tell the client as such
1986 */ 1946 */
1987 nx = x; 1947 nx = x;
1988 ny = y; 1948 ny = y;
1989 m = get_map_from_coord (pl->map, &nx, &ny); 1949 m = get_map_from_coord (pl->map, &nx, &ny);
1950
1990 if (!m) 1951 if (!m)
1991 { 1952 {
1992 /* space is out of map. Update space and clear values 1953 /* space is out of map. Update space and clear values
1993 * 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
1994 * of the map, it shouldn't have a head 1955 * of the map, it shouldn't have a head
1995 */ 1956 */
1996 if (lastcell.count != -1) 1957 if (lastcell.count != -1)
1997 { 1958 {
1998 SockList_AddShort (&sl, mask); 1959 sl << uint16 (mask);
1999 map_clearcell (&lastcell, 0, 0, 0, -1); 1960 map_clearcell (&lastcell, 0, 0, 0, -1);
2000 } 1961 }
2001 } 1962 }
2002 else if (d > 3) 1963 else if (d > 3)
2003 { 1964 {
… …
2007 * reason. Still may need to send the head for this space. 1968 * reason. Still may need to send the head for this space.
2008 */ 1969 */
2009 1970
2010 oldlen = sl.len; 1971 oldlen = sl.len;
2011 1972
2012 SockList_AddShort (&sl, mask); 1973 sl << uint16 (mask);
1974
2013 if (lastcell.count != -1) 1975 if (lastcell.count != -1)
2014 need_send = 1; 1976 need_send = 1;
1977
2015 count = -1; 1978 count = -1;
2016 1979
2017 if (socket.mapmode == Map1aCmd && have_head (ax, ay)) 1980 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
2018 { 1981 {
2019 /* Now check to see if any heads need to be sent */ 1982 /* Now check to see if any heads need to be sent */
2020 1983
2021 if (check_head (sl, socket, ax, ay, 2)) 1984 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
2022 mask |= 0x4;
2023 if (check_head (sl, socket, ax, ay, 1)) 1985 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
2024 mask |= 0x2;
2025 if (check_head (sl, socket, ax, ay, 0)) 1986 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
2026 mask |= 0x1;
2027 1987
2028 lastcell.count = count; 1988 lastcell.count = count;
2029
2030 } 1989 }
2031 else 1990 else
2032 { 1991 {
2033 struct MapCell *cell = &lastcell;
2034
2035 /* properly clear a previously sent big face */ 1992 /* properly clear a previously sent big face */
2036 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)
2037 need_send = 1; 1995 need_send = 1;
1996
2038 map_clearcell (&lastcell, 0, 0, 0, count); 1997 map_clearcell (&lastcell, 0, 0, 0, count);
2039 } 1998 }
2040 1999
2041 if ((mask & 0xf) || need_send) 2000 if ((mask & 0xf) || need_send)
2042 {
2043 sl.buf[oldlen + 1] = mask & 0xff; 2001 sl.buf[oldlen + 1] = mask & 0xff;
2044 }
2045 else 2002 else
2046 {
2047 sl.len = oldlen; 2003 sl.len = oldlen;
2048 }
2049 } 2004 }
2050 else 2005 else
2051 { 2006 {
2052 /* 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
2053 * we need to send. 2008 * we need to send.
… …
2065 */ 2020 */
2066 oldlen = sl.len; 2021 oldlen = sl.len;
2067 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 2022 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2068 eoldlen = esl.len; 2023 eoldlen = esl.len;
2069 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 2024 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2070 SockList_AddShort (&sl, mask); 2025 sl << uint16 (mask);
2071 2026
2072 if (socket.ext_mapinfos) 2027 if (socket.ext_mapinfos)
2073 SockList_AddShort (&esl, emask); 2028 esl << uint16 (emask);
2074 2029
2075 unsigned char dummy; 2030 unsigned char dummy;
2076 unsigned char *last_ext = &dummy; 2031 unsigned char *last_ext = &dummy;
2077 2032
2078 /* Darkness changed */ 2033 /* Darkness changed */
… …
2082 2037
2083 if (socket.extmap) 2038 if (socket.extmap)
2084 { 2039 {
2085 *last_ext |= 0x80; 2040 *last_ext |= 0x80;
2086 last_ext = sl.buf + sl.len; 2041 last_ext = sl.buf + sl.len;
2087 SockList_AddChar (&sl, d); 2042 sl << uint8 (d);
2088 } 2043 }
2089 else 2044 else
2090 SockList_AddChar (&sl, 255 - 64 * d); 2045 sl << uint8 (255 - 64 * d);
2091 } 2046 }
2092 2047
2093 lastcell.count = d; 2048 lastcell.count = d;
2094 2049
2095 if (socket.extmap) 2050 if (socket.extmap)
2096 { 2051 {
2097 uint8 stat_hp = 0; 2052 uint8 stat_hp = 0;
2098 uint8 stat_width = 0; 2053 uint8 stat_width = 0;
2054 uint8 flags = 0;
2099 tag_t player = 0; 2055 UUID player = 0;
2100 2056
2101 // send hp information, if applicable 2057 // send hp information, if applicable
2102 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 2058 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))
2103 { 2059 {
2104 if (op->head || op->invisible) 2060 if (op->head || op->invisible)
… …
2111 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 2067 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
2112 stat_width = op->arch->tail_x; 2068 stat_width = op->arch->tail_x;
2113 } 2069 }
2114 } 2070 }
2115 2071
2072 if (op->msg && op->msg[0] == '@')
2073 flags |= 1;
2074
2116 if (op->type == PLAYER && op != pl) 2075 if (op->type == PLAYER && op != pl)
2117 player = op->count; 2076 player = op->count;
2118 } 2077 }
2119 2078
2120 if (lastcell.stat_hp != stat_hp) 2079 if (lastcell.stat_hp != stat_hp)
… …
2122 lastcell.stat_hp = stat_hp; 2081 lastcell.stat_hp = stat_hp;
2123 2082
2124 mask |= 0x8; 2083 mask |= 0x8;
2125 *last_ext |= 0x80; 2084 *last_ext |= 0x80;
2126 last_ext = sl.buf + sl.len; 2085 last_ext = sl.buf + sl.len;
2127 SockList_AddChar (&sl, 5); 2086
2128 SockList_AddChar (&sl, stat_hp); 2087 sl << uint8 (5) << uint8 (stat_hp);
2129 2088
2130 if (stat_width > 1) 2089 if (stat_width > 1)
2131 { 2090 {
2132 *last_ext |= 0x80; 2091 *last_ext |= 0x80;
2133 last_ext = sl.buf + sl.len; 2092 last_ext = sl.buf + sl.len;
2134 SockList_AddChar (&sl, 6); 2093
2135 SockList_AddChar (&sl, stat_width); 2094 sl << uint8 (6) << uint8 (stat_width);
2136 } 2095 }
2137 } 2096 }
2138 2097
2139 if (lastcell.player !=player) 2098 if (lastcell.player != player)
2140 { 2099 {
2141 lastcell.player = player; 2100 lastcell.player = player;
2142 2101
2143 mask |= 0x8; 2102 mask |= 0x8;
2144 *last_ext |= 0x80; 2103 *last_ext |= 0x80;
2145 last_ext = sl.buf + sl.len; 2104 last_ext = sl.buf + sl.len;
2146 SockList_AddChar (&sl, 0x47); 2105
2147 SockList_AddChar (&sl, 4); 2106 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2148 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);
2149 } 2118 }
2150 } 2119 }
2151 2120
2152 /* Floor face */ 2121 /* Floor face */
2153 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 2)) 2122 if (update_space (sl, socket, m, nx, ny, ax, ay, 2))
2154 mask |= 0x4; 2123 mask |= 0x4;
2155 2124
2156 if (socket.EMI_smooth) 2125 if (socket.EMI_smooth)
2157 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 2)) 2126 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
2158 emask |= 0x4; 2127 emask |= 0x4;
2159 2128
2160 /* Middle face */ 2129 /* Middle face */
2161 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 1)) 2130 if (update_space (sl, socket, m, nx, ny, ax, ay, 1))
2162 mask |= 0x2; 2131 mask |= 0x2;
2163 2132
2164 if (socket.EMI_smooth) 2133 if (socket.EMI_smooth)
2165 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 1)) 2134 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
2166 emask |= 0x2; 2135 emask |= 0x2;
2167 2136
2168 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))
2169 { 2138 {
2170 if (lastcell.faces[0] != pl->face->number) 2139 if (lastcell.faces[0] != pl->face->number)
2171 { 2140 {
2172 lastcell.faces[0] = pl->face->number; 2141 lastcell.faces[0] = pl->face->number;
2173 mask |= 0x1; 2142 mask |= 0x1;
2143
2174 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 2144 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
2175 esrv_send_face (&socket, pl->face->number, 0); 2145 esrv_send_face (&socket, pl->face->number, 0);
2176 SockList_AddShort (&sl, pl->face->number); 2146
2147 sl << uint16 (pl->face->number);
2177 } 2148 }
2178 } 2149 }
2179 /* Top face */
2180 else 2150 else
2181 { 2151 {
2152 /* Top face */
2182 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 0)) 2153 if (update_space (sl, socket, m, nx, ny, ax, ay, 0))
2183 mask |= 0x1; 2154 mask |= 0x1;
2155
2184 if (socket.EMI_smooth) 2156 if (socket.EMI_smooth)
2185 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 0)) 2157 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
2186 {
2187 emask |= 0x1; 2158 emask |= 0x1;
2188 }
2189 } 2159 }
2160
2190 /* 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
2191 * space by checking the mask. If so, update the mask. 2162 * space by checking the mask. If so, update the mask.
2192 * 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
2193 * value, so we don't send those bits. 2164 * value, so we don't send those bits.
2194 */ 2165 */
2195 if (mask & 0xf) 2166 if (mask & 0xf)
2196 {
2197 sl.buf[oldlen + 1] = mask & 0xff; 2167 sl.buf[oldlen + 1] = mask & 0xff;
2198 }
2199 else 2168 else
2200 {
2201 sl.len = oldlen; 2169 sl.len = oldlen;
2202 } 2170
2203 if (emask & 0xf) 2171 if (emask & 0xf)
2204 {
2205 esl.buf[eoldlen + 1] = emask & 0xff; 2172 esl.buf[eoldlen + 1] = emask & 0xff;
2206 }
2207 else 2173 else
2208 {
2209 esl.len = eoldlen; 2174 esl.len = eoldlen;
2210 }
2211 } /* else this is a viewable space */ 2175 } /* else this is a viewable space */
2212 } /* for x loop */ 2176 } /* for x loop */
2213 } /* for y loop */ 2177 } /* for y loop */
2214 2178
2215 /* Verify that we in fact do need to send this */ 2179 /* Verify that we in fact do need to send this */
… …
2221 * it doesn't need draw! 2185 * it doesn't need draw!
2222 */ 2186 */
2223 ewhatflag &= (~EMI_NOREDRAW); 2187 ewhatflag &= (~EMI_NOREDRAW);
2224 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 2188 esl.buf[ewhatstart + 1] = ewhatflag & 0xff;
2225 } 2189 }
2190
2226 if (esl.len > estartlen) 2191 if (esl.len > estartlen)
2227 {
2228 Send_With_Handling (&socket, &esl); 2192 Send_With_Handling (&socket, &esl);
2229 }
2230 free (esl.buf);
2231 } 2193 }
2194
2232 if (sl.len > startlen || socket.sent_scroll) 2195 if (sl.len > startlen || socket.sent_scroll)
2233 { 2196 {
2234 Send_With_Handling (&socket, &sl); 2197 Send_With_Handling (&socket, &sl);
2235 socket.sent_scroll = 0; 2198 socket.sent_scroll = 0;
2236 } 2199 }
2237 free (sl.buf); 2200
2201 sl.free ();
2202 esl.free ();
2238} 2203}
2239 2204
2240/** 2205/**
2241 * Draws client map. 2206 * Draws client map.
2242 */ 2207 */
… …
2247 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 2212 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
2248 New_Face *face, *floor; 2213 New_Face *face, *floor;
2249 New_Face *floor2; 2214 New_Face *floor2;
2250 int d, mflags; 2215 int d, mflags;
2251 struct Map newmap; 2216 struct Map newmap;
2252 mapstruct *m, *pm; 2217 maptile *m, *pm;
2253 2218
2254 if (pl->type != PLAYER) 2219 if (pl->type != PLAYER)
2255 { 2220 {
2256 LOG (llevError, "draw_client_map called with non player/non eric-server\n"); 2221 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
2257 return; 2222 return;
… …
2356 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap); 2321 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap);
2357 } 2322 }
2358 } /* Is a valid space */ 2323 } /* Is a valid space */
2359 } 2324 }
2360 } 2325 }
2326
2361 esrv_map_doneredraw (&pl->contr->socket, &newmap); 2327 esrv_map_doneredraw (&pl->contr->socket, &newmap);
2362 2328
2363 check_map_change (pl->contr); 2329 check_map_change (pl->contr);
2364} 2330}
2365 2331
… …
2382/** 2348/**
2383 * This sends the skill number to name mapping. We ignore 2349 * This sends the skill number to name mapping. We ignore
2384 * the params - we always send the same info no matter what. 2350 * the params - we always send the same info no matter what.
2385 */ 2351 */
2386void 2352void
2387send_skill_info (NewSocket * ns, char *params) 2353send_skill_info (NewSocket *ns, char *params)
2388{ 2354{
2389 SockList sl; 2355 SockList sl (MAXSOCKBUF);
2390 int i; 2356 sl << "replyinfo skill_info\n";
2391 2357
2392 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
2393 strcpy ((char *) sl.buf, "replyinfo skill_info\n");
2394 for (i = 1; i < NUM_SKILLS; i++) 2358 for (int i = 1; i < NUM_SKILLS; i++)
2395 {
2396 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]);
2397 } 2360
2398 sl.len = strlen ((char *) sl.buf);
2399 if (sl.len >= MAXSOCKBUF) 2361 if (sl.len >= MAXSOCKBUF)
2400 { 2362 {
2401 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2363 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2402 fatal (0); 2364 fatal (0);
2403 } 2365 }
2366
2404 Send_With_Handling (ns, &sl); 2367 Send_With_Handling (ns, &sl);
2405 free (sl.buf); 2368 sl.free ();
2406} 2369}
2407 2370
2408/** 2371/**
2409 * This sends the spell path to name mapping. We ignore 2372 * This sends the spell path to name mapping. We ignore
2410 * the params - we always send the same info no matter what. 2373 * the params - we always send the same info no matter what.
2411 */ 2374 */
2412void 2375void
2413send_spell_paths (NewSocket * ns, char *params) 2376send_spell_paths (NewSocket * ns, char *params)
2414{ 2377{
2415 SockList sl; 2378 SockList sl (MAXSOCKBUF);
2416 int i;
2417 2379
2418 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2380 sl << "replyinfo spell_paths\n";
2419 strcpy ((char *) sl.buf, "replyinfo spell_paths\n"); 2381
2420 for (i = 0; i < NRSPELLPATHS; i++) 2382 for (int i = 0; i < NRSPELLPATHS; i++)
2421 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]);
2422 sl.len = strlen ((char *) sl.buf); 2384
2423 if (sl.len >= MAXSOCKBUF) 2385 if (sl.len >= MAXSOCKBUF)
2424 { 2386 {
2425 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2387 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2426 fatal (0); 2388 fatal (0);
2427 } 2389 }
2390
2428 Send_With_Handling (ns, &sl); 2391 Send_With_Handling (ns, &sl);
2429 free (sl.buf); 2392 sl.free ();
2430} 2393}
2431 2394
2432/** 2395/**
2433 * 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.
2434 * 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
2435 */ 2398 */
2436void 2399void
2437esrv_update_spells (player *pl) 2400esrv_update_spells (player *pl)
2438{ 2401{
2439 SockList sl;
2440 int flags = 0;
2441 object *spell;
2442
2443 if (!pl->socket.monitor_spells) 2402 if (!pl->socket.monitor_spells)
2444 return; 2403 return;
2404
2445 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2405 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2446 { 2406 {
2447 if (spell->type == SPELL) 2407 if (spell->type == SPELL)
2448 { 2408 {
2409 int flags = 0;
2410
2449 /* check if we need to update it */ 2411 /* check if we need to update it */
2450 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))
2451 { 2413 {
2452 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);
2453 flags |= UPD_SP_MANA; 2415 flags |= UPD_SP_MANA;
2454 } 2416 }
2417
2455 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))
2456 { 2419 {
2457 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);
2458 flags |= UPD_SP_GRACE; 2421 flags |= UPD_SP_GRACE;
2459 } 2422 }
2423
2460 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))
2461 { 2425 {
2462 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);
2463 flags |= UPD_SP_DAMAGE; 2427 flags |= UPD_SP_DAMAGE;
2464 } 2428 }
2429
2465 if (flags != 0) 2430 if (flags)
2466 { 2431 {
2467 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2432 SockList sl (MAXSOCKBUF);
2468 strcpy ((char *) sl.buf, "updspell "); 2433
2469 sl.len = strlen ((char *) sl.buf); 2434 sl << "updspell "
2470 SockList_AddChar (&sl, flags); 2435 << uint8 (flags)
2471 SockList_AddInt (&sl, spell->count); 2436 << uint32 (spell->count);
2472 if (flags & UPD_SP_MANA) 2437
2473 SockList_AddShort (&sl, spell->last_sp); 2438 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2474 if (flags & UPD_SP_GRACE) 2439 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2475 SockList_AddShort (&sl, spell->last_grace); 2440 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2476 if (flags & UPD_SP_DAMAGE) 2441
2477 SockList_AddShort (&sl, spell->last_eat);
2478 flags = 0;
2479 Send_With_Handling (&pl->socket, &sl); 2442 Send_With_Handling (&pl->socket, &sl);
2480 free (sl.buf); 2443 sl.free ();
2481 } 2444 }
2482 } 2445 }
2483 } 2446 }
2484} 2447}
2485 2448
2486void 2449void
2487esrv_remove_spell (player *pl, object *spell) 2450esrv_remove_spell (player *pl, object *spell)
2488{ 2451{
2489 SockList sl;
2490
2491 if (!pl->socket.monitor_spells) 2452 if (!pl->socket.monitor_spells)
2492 return; 2453 return;
2454
2493 if (!pl || !spell || spell->env != pl->ob) 2455 if (!pl || !spell || spell->env != pl->ob)
2494 { 2456 {
2495 LOG (llevError, "Invalid call to esrv_remove_spell"); 2457 LOG (llevError, "Invalid call to esrv_remove_spell");
2496 return; 2458 return;
2497 } 2459 }
2498 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2460
2499 strcpy ((char *) sl.buf, "delspell "); 2461 SockList sl (MAXSOCKBUF);
2500 sl.len = strlen ((char *) sl.buf); 2462
2501 SockList_AddInt (&sl, spell->count); 2463 sl << "delspell "
2464 << uint32 (spell->count);
2465
2502 Send_With_Handling (&pl->socket, &sl); 2466 Send_With_Handling (&pl->socket, &sl);
2503 free (sl.buf); 2467 sl.free ();
2504} 2468}
2505 2469
2506/* 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. */
2507static void 2471static void
2508append_spell (player *pl, SockList * sl, object *spell) 2472append_spell (player *pl, SockList &sl, object *spell)
2509{ 2473{
2510 int len, i, skill = 0; 2474 int len, i, skill = 0;
2511 2475
2512 if (!(spell->name)) 2476 if (!(spell->name))
2513 { 2477 {
2514 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);
2515 return; 2479 return;
2516 } 2480 }
2517 SockList_AddInt (sl, spell->count); 2481
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 */ 2482 /* 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); 2483 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); 2484 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); 2485 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 2486
2529 /* figure out which skill it uses, if it uses one */ 2487 /* figure out which skill it uses, if it uses one */
2530 if (spell->skill) 2488 if (spell->skill)
2531 { 2489 {
2532 for (i = 1; i < NUM_SKILLS; i++) 2490 for (i = 1; i < NUM_SKILLS; i++)
… …
2534 { 2492 {
2535 skill = i + CS_STAT_SKILLINFO; 2493 skill = i + CS_STAT_SKILLINFO;
2536 break; 2494 break;
2537 } 2495 }
2538 } 2496 }
2539 SockList_AddChar (sl, skill);
2540 2497
2541 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)
2542 SockList_AddInt (sl, (spell->face) ? spell->face->number : 0); 2507 << uint32 (spell->face ? spell->face->number : 0)
2543 2508 << data8 (spell->name)
2544 len = strlen (spell->name); 2509 << 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} 2510}
2561 2511
2562/** 2512/**
2563 * 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
2564 * all spells in the player's inventory. 2514 * all spells in the player's inventory.
2565 */ 2515 */
2566void 2516void
2567esrv_add_spells (player *pl, object *spell) 2517esrv_add_spells (player *pl, object *spell)
2568{ 2518{
2569 SockList sl;
2570
2571 if (!pl) 2519 if (!pl)
2572 { 2520 {
2573 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");
2574 return; 2522 return;
2575 } 2523 }
2524
2576 if (!pl->socket.monitor_spells) 2525 if (!pl->socket.monitor_spells)
2577 return; 2526 return;
2578 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2527
2579 strcpy ((char *) sl.buf, "addspell "); 2528 SockList sl (MAXSOCKBUF);
2580 sl.len = strlen ((char *) sl.buf); 2529
2530 sl << "addspell ";
2531
2581 if (!spell) 2532 if (!spell)
2582 { 2533 {
2583 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2534 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2584 { 2535 {
2585 /* were we to simply keep appending data here, we could exceed 2536 /* 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 2546 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2596 * like it will fix this 2547 * like it will fix this
2597 */ 2548 */
2598 if (spell->type != SPELL) 2549 if (spell->type != SPELL)
2599 continue; 2550 continue;
2551
2600 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))))
2601 { 2553 {
2602 Send_With_Handling (&pl->socket, &sl); 2554 Send_With_Handling (&pl->socket, &sl);
2603 strcpy ((char *) sl.buf, "addspell "); 2555 strcpy ((char *) sl.buf, "addspell ");
2604 sl.len = strlen ((char *) sl.buf); 2556 sl.len = strlen ((char *) sl.buf);
2605 } 2557 }
2558
2606 append_spell (pl, &sl, spell); 2559 append_spell (pl, sl, spell);
2607 } 2560 }
2608 } 2561 }
2609 else if (spell->type != SPELL) 2562 else if (spell->type != SPELL)
2610 { 2563 {
2611 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");
2612 return; 2565 return;
2613 } 2566 }
2614 else 2567 else
2615 append_spell (pl, &sl, spell); 2568 append_spell (pl, sl, spell);
2569
2616 if (sl.len >= MAXSOCKBUF) 2570 if (sl.length () >= MAXSOCKBUF)
2617 { 2571 {
2618 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2572 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2619 fatal (0); 2573 fatal (0);
2620 } 2574 }
2575
2621 /* finally, we can send the packet */ 2576 /* finally, we can send the packet */
2622 Send_With_Handling (&pl->socket, &sl); 2577 Send_With_Handling (&pl->socket, &sl);
2623 free (sl.buf); 2578
2579 sl.free ();
2624} 2580}
2581

Diff Legend

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