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.8 by root, Thu Aug 24 10:58:39 2006 UTC vs.
Revision 1.42 by root, Sat Dec 16 03:08:26 2006 UTC

1/*
2 * static char *rcsid_init_c =
3 * "$Id: request.C,v 1.8 2006/08/24 10:58:39 root Exp $";
4 */
5
6/* 1/*
7 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
8 3
9 Copyright (C) 2001 Mark Wedel 4 Copyright (C) 2001 Mark Wedel
10 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
21 16
22 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
23 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
25 20
26 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>
27*/ 22*/
28 23
29/** 24/**
30 * \file 25 * \file
31 * Client handling. 26 * Client handling.
… …
46 * if a face has not already been sent to the client, it is sent now. 41 * if a face has not already been sent to the client, it is sent now.
47 * 42 *
48 * mapcellchanged, compactlayer, compactstack, perform the map compressing 43 * mapcellchanged, compactlayer, compactstack, perform the map compressing
49 * operations 44 * operations
50 * 45 *
51 * esrv_map_doneredraw finishes the map update, and ships across the
52 * map updates.
53 *
54 * esrv_map_scroll tells the client to scroll the map, and does similarily
55 * for the locally cached copy.
56 */ 46 */
57 47
58#include <global.h> 48#include <global.h>
59#include <sproto.h> 49#include <sproto.h>
60 50
61#include <newclient.h>
62#include <newserver.h>
63#include <living.h> 51#include <living.h>
64#include <commands.h> 52#include <commands.h>
65 53
66/* This block is basically taken from socket.c - I assume if it works there, 54/* This block is basically taken from socket.c - I assume if it works there,
67 * it should work here. 55 * it should work here.
68 */ 56 */
69#ifndef WIN32 /* ---win32 exclude unix headers */
70#include <sys/types.h> 57#include <sys/types.h>
71#include <sys/time.h> 58#include <sys/time.h>
72#include <sys/socket.h> 59#include <sys/socket.h>
73#include <netinet/in.h> 60#include <netinet/in.h>
74#include <netdb.h> 61#include <netdb.h>
75#endif /* win32 */
76 62
77#ifdef HAVE_UNISTD_H
78#include <unistd.h> 63#include <unistd.h>
79#endif
80
81#ifdef HAVE_SYS_TIME_H
82#include <sys/time.h> 64#include <sys/time.h>
83#endif
84 65
85#include "sounds.h" 66#include "sounds.h"
86 67
87/** 68/**
88 * This table translates the attack numbers as used within the 69 * This table translates the attack numbers as used within the
89 * program to the value we use when sending STATS command to the 70 * program to the value we use when sending STATS command to the
90 * client. If a value is -1, then we don't send that to the 71 * client. If a value is -1, then we don't send that to the
91 * client. 72 * client.
92 */ 73 */
93short atnr_cs_stat[NROFATTACKS] = {CS_STAT_RES_PHYS, 74short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS,
94 CS_STAT_RES_MAG,CS_STAT_RES_FIRE, CS_STAT_RES_ELEC, 75 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC,
95 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID, 76 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID,
96 CS_STAT_RES_DRAIN, -1 /* weaponmagic */, 77 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,
97 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON, 78 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,
98 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD, 79 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD,
99 CS_STAT_RES_FEAR, -1 /* Cancellation */, 80 CS_STAT_RES_FEAR, -1 /* Cancellation */ ,
100 CS_STAT_RES_DEPLETE, CS_STAT_RES_DEATH, 81 CS_STAT_RES_DEPLETE, CS_STAT_RES_DEATH,
101 -1 /* Chaos */, -1 /* Counterspell */, 82 -1 /* Chaos */ , -1 /* Counterspell */ ,
102 -1 /* Godpower */, CS_STAT_RES_HOLYWORD, 83 -1 /* Godpower */ , CS_STAT_RES_HOLYWORD,
103 CS_STAT_RES_BLIND, 84 CS_STAT_RES_BLIND,
104 -1, /* Internal */ 85 -1, /* Internal */
105 -1, /* life stealing */ 86 -1, /* life stealing */
106 -1 /* Disease - not fully done yet */ 87 -1 /* Disease - not fully done yet */
107}; 88};
108 89
109static void 90static void
110socket_map_scroll (NewSocket *ns, int dx, int dy) 91socket_map_scroll (client * ns, int dx, int dy)
111{ 92{
112 struct Map newmap; 93 struct Map newmap;
113 int x,y, mx, my; 94 int x, y, mx, my;
114 95
115 {
116 char buf[MAXSOCKBUF];
117
118 sprintf(buf,"map_scroll %d %d", dx, dy); 96 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
119 Write_String_To_Socket(ns, buf, strlen (buf));
120 }
121 97
122 /* If we are using the Map1aCmd, we may in fact send 98 /* If we are using the Map1aCmd, we may in fact send
123 * head information that is outside the viewable map. 99 * head information that is outside the viewable map.
124 * So set the mx,my to the max value we want to 100 * So set the mx,my to the max value we want to
125 * look for. Removed code to do so - it caused extra 101 * look for. Removed code to do so - it caused extra
126 * complexities for the client, and probably doesn't make 102 * complexities for the client, and probably doesn't make
127 * that much difference in bandwidth. 103 * that much difference in bandwidth.
128 */ 104 */
129 mx = ns->mapx; 105 mx = ns->mapx;
130 my = ns->mapy; 106 my = ns->mapy;
131 107
132 if (ns->mapmode == Map1aCmd) { 108 if (ns->mapmode == Map1aCmd)
109 {
133 mx += MAX_HEAD_OFFSET; 110 mx += MAX_HEAD_OFFSET;
134 my += MAX_HEAD_OFFSET; 111 my += MAX_HEAD_OFFSET;
135 } 112 }
136 113
137 /* the x and y here are coordinates for the new map, i.e. if we moved 114 /* the x and y here are coordinates for the new map, i.e. if we moved
138 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, 115 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
139 * if the destination x or y coordinate is outside the viewable 116 * if the destination x or y coordinate is outside the viewable
140 * area, we clear the values - otherwise, the old values 117 * area, we clear the values - otherwise, the old values
141 * are preserved, and the check_head thinks it needs to clear them. 118 * are preserved, and the check_head thinks it needs to clear them.
142 */ 119 */
143 for(x=0; x<mx; x++) { 120 for (x = 0; x < mx; x++)
144 for(y=0; y<my; y++) { 121 {
122 for (y = 0; y < my; y++)
123 {
145 if(x >= ns->mapx || y >= ns->mapy) { 124 if (x >= ns->mapx || y >= ns->mapy)
146 /* clear cells outside the viewable area */ 125 /* clear cells outside the viewable area */
147 memset(&newmap.cells[x][y], 0, sizeof(struct MapCell)); 126 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
148 }
149 else if ((x+dx) < 0 || (x+dx) >= ns->mapx || (y+dy) < 0 || (y + dy) >= ns->mapy) { 127 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
150 /* clear newly visible tiles within the viewable area */ 128 /* clear newly visible tiles within the viewable area */
151 memset(&(newmap.cells[x][y]), 0, sizeof(struct MapCell)); 129 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
130 else
131 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
132 }
152 } 133 }
153 else {
154 memcpy(&(newmap.cells[x][y]),
155 &(ns->lastmap.cells[x+dx][y+dy]),sizeof(struct MapCell));
156 }
157 }
158 }
159 134
160 memcpy(&(ns->lastmap), &newmap,sizeof(struct Map)); 135 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
161 136
162 /* Make sure that the next "map1" command will be sent (even if it is 137 /* Make sure that the next "map1" command will be sent (even if it is
163 * empty). 138 * empty).
164 */ 139 */
165 ns->sent_scroll = 1; 140 ns->sent_scroll = 1;
166} 141}
167 142
168static void 143static void
169clear_map (player *pl) 144clear_map (player *pl)
170{ 145{
171 NewSocket &socket = pl->socket; 146 client &socket = *pl->socket;
172 147
173 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 148 memset (&socket.lastmap, 0, sizeof (socket.lastmap));
174 149
175 if (socket.newmapcmd == 1) 150 if (socket.newmapcmd == 1)
176 Write_String_To_Socket (&socket, "newmap", 6); 151 socket.send_packet ("newmap");
177 152
178 socket.update_look = 1; 153 socket.update_look = 1;
179 socket.look_position = 0; 154 socket.look_position = 0;
180} 155}
181 156
182/** check for map change and send new map data */ 157/** check for map change and send new map data */
183static void 158static void
184check_map_change (player *pl) 159check_map_change (player *pl)
185{ 160{
186 NewSocket &socket = pl->socket; 161 client &socket = *pl->socket;
187 object *ob = pl->ob; 162 object *ob = pl->ob;
188 char buf[MAX_BUF]; /* eauugggh */ 163 char buf[MAX_BUF]; /* eauugggh */
189 164
190 if (socket.current_map != ob->map) 165 if (socket.current_map != ob->map)
191 { 166 {
192 socket.current_map = ob->map; 167 socket.current_map = ob->map;
193 168
194 clear_map (pl); 169 clear_map (pl);
195 170
196 if (socket.mapinfocmd) 171 if (socket.mapinfocmd)
197 { 172 {
198 if (ob->map && ob->map->path [0]) 173 if (ob->map && ob->map->path[0])
199 { 174 {
200 int flags = 0; 175 int flags = 0;
201 176
202 if (ob->map->tile_path [0]) flags |= 1; 177 if (ob->map->tile_path[0])
178 flags |= 1;
203 if (ob->map->tile_path [1]) flags |= 2; 179 if (ob->map->tile_path[1])
180 flags |= 2;
204 if (ob->map->tile_path [2]) flags |= 4; 181 if (ob->map->tile_path[2])
182 flags |= 4;
205 if (ob->map->tile_path [3]) flags |= 8; 183 if (ob->map->tile_path[3])
184 flags |= 8;
206 185
207 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 186 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
208 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, 187 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path);
209 ob->map->width, ob->map->height, ob->map->path);
210 } 188 }
211 else 189 else
212 snprintf (buf, MAX_BUF, "mapinfo current"); 190 snprintf (buf, MAX_BUF, "mapinfo current");
213 191
214 Write_String_To_Socket (&socket, buf, strlen (buf)); 192 socket.send_packet (buf);
215 } 193 }
216 } 194 }
217 else if (socket.current_x != ob->x || socket.current_y != ob->y) 195 else if (socket.current_x != ob->x || socket.current_y != ob->y)
218 { 196 {
219 int dx = ob->x - socket.current_x; 197 int dx = ob->x - socket.current_x;
220 int dy = ob->y - socket.current_y; 198 int dy = ob->y - socket.current_y;
221 199
222 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 200 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
223 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows 201 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
224 else 202 else
225 { 203 {
226 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 204 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
227 socket.update_look = 1; 205 socket.update_look = 1;
228 socket.look_position = 0; 206 socket.look_position = 0;
… …
231 209
232 socket.current_x = ob->x; 210 socket.current_x = ob->x;
233 socket.current_y = ob->y; 211 socket.current_y = ob->y;
234} 212}
235 213
214/**
215 * RequestInfo is sort of a meta command. There is some specific
216 * request of information, but we call other functions to provide
217 * that information.
218 */
219void
220RequestInfo (char *buf, int len, client * ns)
221{
222 char *params = NULL, *cp;
223
224 /* No match */
225 char bigbuf[MAX_BUF];
226 int slen;
227
228 /* Set up replyinfo before we modify any of the buffers - this is used
229 * if we don't find a match.
230 */
231 strcpy (bigbuf, "replyinfo ");
232 slen = strlen (bigbuf);
233 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
234
235 /* find the first space, make it null, and update the
236 * params pointer.
237 */
238 for (cp = buf; *cp != '\0'; cp++)
239 if (*cp == ' ')
240 {
241 *cp = '\0';
242 params = cp + 1;
243 break;
244 }
245
246 if (!strcmp (buf, "image_info"))
247 send_image_info (ns, params);
248 else if (!strcmp (buf, "image_sums"))
249 send_image_sums (ns, params);
250 else if (!strcmp (buf, "skill_info"))
251 send_skill_info (ns, params);
252 else if (!strcmp (buf, "spell_paths"))
253 send_spell_paths (ns, params);
254 else
255 ns->send_packet (bigbuf, len);
256}
257
258void
236void ExtCmd (char *buf, int len, player *pl) 259ExtCmd (char *buf, int len, player *pl)
237{ 260{
238 execute_global_event (EVENT_EXTCMD, pl, buf, len); 261 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
239} 262}
240 263
264void
241void MapInfoCmd (char *buf, int len, player *pl) 265MapInfoCmd (char *buf, int len, player *pl)
242{ 266{
243 // <mapinfo tag spatial tile-path 267 // <mapinfo tag spatial tile-path
244 // >mapinfo tag spatial flags x y w h hash 268 // >mapinfo tag spatial flags x y w h hash
245 269
246 char bigbuf[MAX_BUF], *cp, *token; 270 char bigbuf[MAX_BUF], *token;
247 271
248 token = buf; 272 token = buf;
249 // copy token 273 // copy token
250 if (!(buf = strchr (buf, ' '))) 274 if (!(buf = strchr (buf, ' ')))
251 return; 275 return;
… …
255 if (!strncmp (buf, "spatial ", 8)) 279 if (!strncmp (buf, "spatial ", 8))
256 { 280 {
257 buf += 8; 281 buf += 8;
258 282
259 // initial map and its origin 283 // initial map and its origin
260 mapstruct *map = pl->ob->map; 284 maptile *map = pl->ob->map;
261 sint16 dx, dy; 285 sint16 dx, dy;
262 int mapx = pl->socket.mapx / 2 - pl->ob->x; 286 int mapx = pl->socket->mapx / 2 - pl->ob->x;
263 int mapy = pl->socket.mapy / 2 - pl->ob->y; 287 int mapy = pl->socket->mapy / 2 - pl->ob->y;
264 int max_distance = 8; // limit maximum path length to something generous 288 int max_distance = 8; // limit maximum path length to something generous
265 289
266 while (*buf && map && max_distance) 290 while (*buf && map && max_distance)
267 { 291 {
268 int dir = *buf++; 292 int dir = *buf++;
269 293
270 switch (dir) 294 switch (dir)
271 { 295 {
272 case '1': 296 case '1':
297 dx = 0;
298 dy = -1;
273 dx = 0; dy = -1; map = get_map_from_coord (map, &dx, &dy); 299 map = get_map_from_coord (map, &dx, &dy);
274 map && (mapy -= map->height); 300 map && (mapy -= map->height);
275 break; 301 break;
276 case '2': 302 case '2':
277 mapx += map->width; 303 mapx += map->width;
304 dx = map->width;
305 dy = 0;
278 dx = map->width; dy = 0; map = get_map_from_coord (map, &dx, &dy); 306 map = get_map_from_coord (map, &dx, &dy);
279 break; 307 break;
280 case '3': 308 case '3':
281 mapy += map->height; 309 mapy += map->height;
310 dx = 0;
311 dy = map->height;
282 dx = 0; dy = map->height; map = get_map_from_coord (map, &dx, &dy); 312 map = get_map_from_coord (map, &dx, &dy);
283 break; 313 break;
284 case '4': 314 case '4':
315 dx = -1;
316 dy = 0;
285 dx = -1; dy = 0; map = get_map_from_coord (map, &dx, &dy); 317 map = get_map_from_coord (map, &dx, &dy);
286 map && (mapx -= map->width); 318 map && (mapx -= map->width);
287 break; 319 break;
288 } 320 }
289 321
290 --max_distance; 322 --max_distance;
291 } 323 }
292 324
293 if (!max_distance) 325 if (!max_distance)
294 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token); 326 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
295 else if (map && map->path [0]) 327 else if (map && map->path[0])
296 { 328 {
297 int flags = 0; 329 int flags = 0;
298 330
299 if (map->tile_path [0]) flags |= 1; 331 if (map->tile_path[0])
332 flags |= 1;
300 if (map->tile_path [1]) flags |= 2; 333 if (map->tile_path[1])
334 flags |= 2;
301 if (map->tile_path [2]) flags |= 4; 335 if (map->tile_path[2])
336 flags |= 4;
302 if (map->tile_path [3]) flags |= 8; 337 if (map->tile_path[3])
338 flags |= 8;
303 339
304 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", 340 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path);
305 token, flags, mapx, mapy,
306 map->width, map->height, map->path);
307 } 341 }
308 else 342 else
309 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 343 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
310 } 344 }
311 else 345 else
312 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 346 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
313 347
314 Write_String_To_Socket (&pl->socket, bigbuf, strlen (bigbuf)); 348 pl->socket->send_packet (bigbuf);
315} 349}
316 350
317/** This is the Setup cmd - easy first implementation */ 351/** This is the Setup cmd - easy first implementation */
352void
318void SetUp(char *buf, int len, NewSocket *ns) 353SetUp (char *buf, int len, client * ns)
319{ 354{
320 int s, slen; 355 int s, slen;
321 char *cmd, *param, cmdback[HUGE_BUF]; 356 char *cmd, *param, cmdback[HUGE_BUF];
322 357
323 /* run through the cmds of setup 358 /* run through the cmds of setup
324 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ... 359 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
325 * 360 *
326 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown 361 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
327 * The client then must sort this out 362 * The client then must sort this out
328 */ 363 */
329 364
330 LOG(llevInfo,"Get SetupCmd:: %s\n", buf); 365 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
366
331 strcpy(cmdback,"setup"); 367 strcpy (cmdback, "setup");
332 for(s=0;s<len; ) { 368 for (s = 0; s < len; )
333 369 {
334 cmd = &buf[s]; 370 cmd = &buf[s];
335 371
336 /* find the next space, and put a null there */ 372 /* find the next space, and put a null there */
337 for(;buf[s] && buf[s] != ' ';s++) ; 373 for (; buf[s] && buf[s] != ' '; s++)
338 buf[s++]=0; 374 ;
375
376 buf[s++] = 0;
377
339 while (buf[s] == ' ') s++; 378 while (buf[s] == ' ')
379 s++;
340 380
341 if(s>=len) 381 if (s >= len)
342 break; 382 break;
343 383
344 param = &buf[s]; 384 param = &buf[s];
345 385
346 for(;buf[s] && buf[s] != ' ';s++) ; 386 for (; buf[s] && buf[s] != ' '; s++)
347 buf[s++]=0; 387 ;
388
389 buf[s++] = 0;
390
348 while (buf[s] == ' ') s++; 391 while (buf[s] == ' ')
349 392 s++;
393
350 slen = strlen(cmdback); 394 slen = strlen (cmdback);
351 safe_strcat(cmdback, " ", &slen, HUGE_BUF); 395 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
352 safe_strcat(cmdback, cmd, &slen, HUGE_BUF); 396 safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
353 safe_strcat(cmdback, " ", &slen, HUGE_BUF); 397 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
354 398
355 if (!strcmp(cmd,"sound")) { 399 if (!strcmp (cmd, "sound"))
400 {
356 ns->sound = atoi(param); 401 ns->sound = atoi (param);
357 safe_strcat(cmdback, param, &slen, HUGE_BUF); 402 safe_strcat (cmdback, param, &slen, HUGE_BUF);
358 } 403 }
359 else if (!strcmp(cmd,"exp64")) { 404 else if (!strcmp (cmd, "exp64"))
405 {
360 ns->exp64 = atoi(param); 406 ns->exp64 = atoi (param);
361 safe_strcat(cmdback, param, &slen, HUGE_BUF); 407 safe_strcat (cmdback, param, &slen, HUGE_BUF);
408 }
362 } else if (!strcmp(cmd, "spellmon")) { 409 else if (!strcmp (cmd, "spellmon"))
410 {
363 ns->monitor_spells = atoi(param); 411 ns->monitor_spells = atoi (param);
364 safe_strcat(cmdback, param, &slen, HUGE_BUF); 412 safe_strcat (cmdback, param, &slen, HUGE_BUF);
413 }
365 } else if (!strcmp(cmd,"darkness")) { 414 else if (!strcmp (cmd, "darkness"))
415 {
366 ns->darkness = atoi(param); 416 ns->darkness = atoi (param);
367 safe_strcat(cmdback, param, &slen, HUGE_BUF); 417 safe_strcat (cmdback, param, &slen, HUGE_BUF);
418 }
368 } else if (!strcmp(cmd,"map1cmd")) { 419 else if (!strcmp (cmd, "map1cmd"))
369 if (atoi(param)) ns->mapmode = Map1Cmd; 420 {
421 if (atoi (param))
422 ns->mapmode = Map1Cmd;
370 /* if beyond this size, need to use map1cmd no matter what */ 423 /* if beyond this size, need to use map1cmd no matter what */
371 if (ns->mapx>11 || ns->mapy>11) ns->mapmode = Map1Cmd; 424 if (ns->mapx > 11 || ns->mapy > 11)
425 ns->mapmode = Map1Cmd;
372 safe_strcat(cmdback, ns->mapmode == Map1Cmd?"1":"0", &slen, HUGE_BUF); 426 safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
427 }
373 } else if (!strcmp(cmd,"map1acmd")) { 428 else if (!strcmp (cmd, "map1acmd"))
374 if (atoi(param)) ns->mapmode = Map1aCmd; 429 {
430 if (atoi (param))
431 ns->mapmode = Map1aCmd;
375 /* if beyond this size, need to use map1acmd no matter what */ 432 /* if beyond this size, need to use map1acmd no matter what */
376 if (ns->mapx>11 || ns->mapy>11) ns->mapmode = Map1aCmd; 433 if (ns->mapx > 11 || ns->mapy > 11)
434 ns->mapmode = Map1aCmd;
377 safe_strcat(cmdback, ns->mapmode == Map1aCmd?"1":"0", &slen, HUGE_BUF); 435 safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
436 }
378 } else if (!strcmp(cmd,"newmapcmd")) { 437 else if (!strcmp (cmd, "newmapcmd"))
438 {
379 ns->newmapcmd= atoi(param); 439 ns->newmapcmd = atoi (param);
380 safe_strcat(cmdback, param, &slen, HUGE_BUF); 440 safe_strcat (cmdback, param, &slen, HUGE_BUF);
381// } else if (!strcmp(cmd,"plugincmd")) { 441// } else if (!strcmp(cmd,"plugincmd")) {
382// ns->plugincmd = atoi(param); 442// ns->plugincmd = atoi(param);
383// safe_strcat(cmdback, param, &slen, HUGE_BUF); 443// safe_strcat(cmdback, param, &slen, HUGE_BUF);
444 }
384 } else if (!strcmp(cmd,"mapinfocmd")) { 445 else if (!strcmp (cmd, "mapinfocmd"))
446 {
385 ns->mapinfocmd = atoi(param); 447 ns->mapinfocmd = atoi (param);
386 safe_strcat(cmdback, "1", &slen, HUGE_BUF); 448 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
449 }
387 } else if (!strcmp(cmd,"extcmd")) { 450 else if (!strcmp (cmd, "extcmd"))
451 {
388 ns->extcmd = atoi(param); 452 ns->extcmd = atoi (param);
389 safe_strcat(cmdback, "1", &slen, HUGE_BUF); 453 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
454 }
390 } else if (!strcmp(cmd,"extmap")) { 455 else if (!strcmp (cmd, "extmap"))
456 {
391 ns->extmap = atoi(param); 457 ns->extmap = atoi (param);
392 safe_strcat(cmdback, "1", &slen, HUGE_BUF); 458 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
459 }
393 } else if (!strcmp(cmd,"facecache")) { 460 else if (!strcmp (cmd, "facecache"))
461 {
394 ns->facecache = atoi(param); 462 ns->facecache = atoi (param);
395 safe_strcat(cmdback, param, &slen, HUGE_BUF); 463 safe_strcat (cmdback, param, &slen, HUGE_BUF);
464 }
396 } else if (!strcmp(cmd,"faceset")) { 465 else if (!strcmp (cmd, "faceset"))
466 {
397 char tmpbuf[20]; 467 char tmpbuf[20];
398 int q = atoi(param); 468 int q = atoi (param);
399 469
400 if (is_valid_faceset(q)) 470 if (is_valid_faceset (q))
401 ns->faceset=q; 471 ns->faceset = q;
402 sprintf(tmpbuf,"%d", ns->faceset); 472 sprintf (tmpbuf, "%d", ns->faceset);
403 safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF); 473 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
404 /* if the client is using faceset, it knows about image2 command */ 474 /* if the client is using faceset, it knows about image2 command */
405 ns->image2=1; 475 ns->image2 = 1;
476 }
406 } else if (!strcmp(cmd,"itemcmd")) { 477 else if (!strcmp (cmd, "itemcmd"))
478 {
407 /* Version of the item protocol command to use. Currently, 479 /* Version of the item protocol command to use. Currently,
408 * only supported versions are 1 and 2. Using a numeric 480 * only supported versions are 1 and 2. Using a numeric
409 * value will make it very easy to extend this in the future. 481 * value will make it very easy to extend this in the future.
410 */ 482 */
411 char tmpbuf[20]; 483 char tmpbuf[20];
412 int q = atoi(param); 484 int q = atoi (param);
413 if (q<1 || q>2) { 485
414 strcpy(tmpbuf,"FALSE"); 486 if (q < 1 || q > 2)
415 } else { 487 {
416 ns->itemcmd = q; 488 strcpy (tmpbuf, "FALSE");
489 }
490 else
491 {
492 ns->itemcmd = q;
417 sprintf(tmpbuf,"%d", ns->itemcmd); 493 sprintf (tmpbuf, "%d", ns->itemcmd);
418 } 494 }
419 safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF); 495 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
496 }
420 } else if (!strcmp(cmd,"mapsize")) { 497 else if (!strcmp (cmd, "mapsize"))
498 {
421 int x, y=0; 499 int x, y = 0;
422 char tmpbuf[MAX_BUF], *cp; 500 char tmpbuf[MAX_BUF], *cp;
423 501
424 x = atoi(param); 502 x = atoi (param);
425 for (cp = param; *cp!=0; cp++) 503 for (cp = param; *cp != 0; cp++)
426 if (*cp == 'x' || *cp == 'X') { 504 if (*cp == 'x' || *cp == 'X')
427 y = atoi(cp+1); 505 {
428 break; 506 y = atoi (cp + 1);
429 } 507 break;
508 }
430 if (x < 9 || y < 9 || x>MAP_CLIENT_X || y > MAP_CLIENT_Y) { 509 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
510 {
431 sprintf(tmpbuf," %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); 511 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
432 safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF); 512 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
433 } else { 513 }
434 ns->mapx = x; 514 else
435 ns->mapy = y; 515 {
516 ns->mapx = x;
517 ns->mapy = y;
436 /* better to send back what we are really using and not the 518 /* better to send back what we are really using and not the
437 * param as given to us in case it gets parsed differently. 519 * param as given to us in case it gets parsed differently.
438 */ 520 */
439 sprintf(tmpbuf,"%dx%d", x,y); 521 sprintf (tmpbuf, "%dx%d", x, y);
440 safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF); 522 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
441 /* If beyond this size and still using orig map command, need to 523 /* If beyond this size and still using orig map command, need to
442 * go to map1cmd. 524 * go to map1cmd.
443 */ 525 */
444 if ((x>11 || y>11) && ns->mapmode == Map0Cmd) ns->mapmode = Map1Cmd; 526 if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
445 } 527 ns->mapmode = Map1Cmd;
528 }
529 }
446 } else if (!strcmp(cmd,"extendedMapInfos")) { 530 else if (!strcmp (cmd, "extendedMapInfos"))
531 {
447 /* Added by tchize 532 /* Added by tchize
448 * prepare to use the mapextended command 533 * prepare to use the mapextended command
449 */ 534 */
450 char tmpbuf[20]; 535 char tmpbuf[20];
536
451 ns->ext_mapinfos = (atoi(param)); 537 ns->ext_mapinfos = (atoi (param));
452 sprintf(tmpbuf,"%d", ns->ext_mapinfos); 538 sprintf (tmpbuf, "%d", ns->ext_mapinfos);
453 safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF); 539 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
540 }
454 } else if (!strcmp(cmd,"extendedTextInfos")) { 541 else if (!strcmp (cmd, "extendedTextInfos"))
542 {
455 /* Added by tchize 543 /* Added by tchize
456 * prepare to use the extended text commands 544 * prepare to use the extended text commands
457 * Client toggle this to non zero to get exttext 545 * Client toggle this to non zero to get exttext
458 */ 546 */
459 char tmpbuf[20]; 547 char tmpbuf[20];
460 548
461 ns->has_readable_type = (atoi(param)); 549 ns->has_readable_type = (atoi (param));
462 sprintf(tmpbuf,"%d", ns->has_readable_type); 550 sprintf (tmpbuf, "%d", ns->has_readable_type);
463 safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF); 551 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
464 } else { 552 }
553 else
554 {
465 /* Didn't get a setup command we understood - 555 /* Didn't get a setup command we understood -
466 * report a failure to the client. 556 * report a failure to the client.
467 */ 557 */
468 safe_strcat(cmdback, "FALSE", &slen, HUGE_BUF); 558 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
469 } 559 }
470 } /* for processing all the setup commands */ 560 } /* for processing all the setup commands */
561
471 LOG(llevInfo,"SendBack SetupCmd:: %s\n", cmdback); 562 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
472 Write_String_To_Socket(ns, cmdback, strlen(cmdback)); 563 ns->send_packet (cmdback);
473} 564}
474 565
475/** 566/**
476 * The client has requested to be added to the game. 567 * The client has requested to be added to the game.
477 * This is what takes care of it. We tell the client how things worked out. 568 * This is what takes care of it. We tell the client how things worked out.
478 * I am not sure if this file is the best place for this function. however, 569 * I am not sure if this file is the best place for this function. however,
479 * it either has to be here or init_sockets needs to be exported. 570 * it either has to be here or init_sockets needs to be exported.
480 */ 571 */
572void
481void AddMeCmd(char *buf, int len, NewSocket *ns) 573AddMeCmd (char *buf, int len, client * ns)
482{ 574{
483 Settings oldsettings; 575 Settings oldsettings;
576
484 oldsettings=settings; 577 oldsettings = settings;
485 if (ns->status != Ns_Add || add_player(ns)) { 578 if (ns->status != Ns_Add || add_player (ns))
486 Write_String_To_Socket(ns, "addme_failed",12); 579 ns->send_packet ("addme_failed");
487 } else { 580 else
488 /* Basically, the add_player copies the socket structure into 581 ns->send_packet ("addme_success");
489 * the player structure, so this one (which is from init_sockets) 582
490 * is not needed anymore. The write below should still work, as the
491 * stuff in ns is still relevant.
492 */
493 Write_String_To_Socket(ns, "addme_success",13);
494 socket_info.nconns--;
495 ns->status = Ns_Avail;
496 }
497 settings=oldsettings; 583 settings = oldsettings;
498} 584}
499 585
500/** Reply to ExtendedInfos command */ 586/** Reply to ExtendedInfos command */
587void
501void ToggleExtendedInfos (char *buf, int len, NewSocket *ns){ 588ToggleExtendedInfos (char *buf, int len, client * ns)
589{
502 char cmdback[MAX_BUF]; 590 char cmdback[MAX_BUF];
503 char command[50]; 591 char command[50];
504 int info,nextinfo; 592 int info, nextinfo;
593
505 cmdback[0]='\0'; 594 cmdback[0] = '\0';
506 nextinfo=0; 595 nextinfo = 0;
596
507 while (1){ 597 while (1)
598 {
508 /* 1. Extract an info*/ 599 /* 1. Extract an info */
509 info=nextinfo; 600 info = nextinfo;
601
510 while ( (info<len) && (buf[info]==' ') ) info++; 602 while ((info < len) && (buf[info] == ' '))
603 info++;
604
511 if (info>=len) 605 if (info >= len)
512 break; 606 break;
607
513 nextinfo=info+1; 608 nextinfo = info + 1;
609
514 while ( (nextinfo<len) && (buf[nextinfo]!=' ') ) 610 while ((nextinfo < len) && (buf[nextinfo] != ' '))
515 nextinfo++; 611 nextinfo++;
612
516 if (nextinfo-info>=49) /*Erroneous info asked*/ 613 if (nextinfo - info >= 49) /*Erroneous info asked */
517 continue; 614 continue;
615
518 strncpy (command,&(buf[info]),nextinfo-info); 616 strncpy (command, &(buf[info]), nextinfo - info);
519 command[nextinfo-info]='\0'; 617
520 /* 2. Interpret info*/ 618 /* 2. Interpret info */
521 if (!strcmp("smooth",command)){ 619 if (!strcmp ("smooth", command))
522 /* Toggle smoothing*/ 620 /* Toggle smoothing */
523 ns->EMI_smooth=!ns->EMI_smooth; 621 ns->EMI_smooth = !ns->EMI_smooth;
524 }else{ 622 else
525 /*bad value*/ 623 /*bad value */;
526 } 624
527 /*3. Next info*/ 625 /*3. Next info */
528 } 626 }
627
529 strcpy (cmdback,"ExtendedInfoSet"); 628 strcpy (cmdback, "ExtendedInfoSet");
629
530 if (ns->EMI_smooth){ 630 if (ns->EMI_smooth)
631 {
531 strcat (cmdback," "); 632 strcat (cmdback, " ");
532 strcat (cmdback,"smoothing"); 633 strcat (cmdback, "smoothing");
533 } 634 }
534 Write_String_To_Socket(ns, cmdback,strlen(cmdback)); 635
636 ns->send_packet (cmdback);
535} 637}
638
536/* 639/*
537#define MSG_TYPE_BOOK 1 640#define MSG_TYPE_BOOK 1
538#define MSG_TYPE_CARD 2 641#define MSG_TYPE_CARD 2
539#define MSG_TYPE_PAPER 3 642#define MSG_TYPE_PAPER 3
540#define MSG_TYPE_SIGN 4 643#define MSG_TYPE_SIGN 4
541#define MSG_TYPE_MONUMENT 5 644#define MSG_TYPE_MONUMENT 5
542#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 645#define MSG_TYPE_SCRIPTED_DIALOG 6*/
646
543/** Reply to ExtendedInfos command */ 647/** Reply to ExtendedInfos command */
648void
544void ToggleExtendedText (char *buf, int len, NewSocket *ns){ 649ToggleExtendedText (char *buf, int len, client * ns)
650{
545 char cmdback[MAX_BUF]; 651 char cmdback[MAX_BUF];
546 char temp[10]; 652 char temp[10];
547 char command[50]; 653 char command[50];
548 int info,nextinfo,i,flag; 654 int info, nextinfo, i, flag;
655
549 cmdback[0]='\0'; 656 cmdback[0] = '\0';
657
550 nextinfo=0; 658 nextinfo = 0;
551 while (1){ 659 while (1)
660 {
552 /* 1. Extract an info*/ 661 /* 1. Extract an info */
553 info=nextinfo; 662 info = nextinfo;
663
554 while ( (info<len) && (buf[info]==' ') ) info++; 664 while ((info < len) && (buf[info] == ' '))
665 info++;
666
555 if (info>=len) 667 if (info >= len)
556 break; 668 break;
669
557 nextinfo=info+1; 670 nextinfo = info + 1;
671
558 while ( (nextinfo<len) && (buf[nextinfo]!=' ') ) 672 while ((nextinfo < len) && (buf[nextinfo] != ' '))
559 nextinfo++; 673 nextinfo++;
674
560 if (nextinfo-info>=49) /*Erroneous info asked*/ 675 if (nextinfo - info >= 49) /*Erroneous info asked */
561 continue; 676 continue;
677
562 strncpy (command,&(buf[info]),nextinfo-info); 678 strncpy (command, &(buf[info]), nextinfo - info);
563 command[nextinfo-info]='\0'; 679 command[nextinfo - info] = '\0';
564 /* 2. Interpret info*/ 680 /* 2. Interpret info */
565 i = sscanf(command,"%d",&flag); 681 i = sscanf (command, "%d", &flag);
682
566 if ( (i==1) && (flag>0) && (flag<=MSG_TYPE_LAST)) 683 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
567 ns->supported_readables|=(1<<flag); 684 ns->supported_readables |= (1 << flag);
568 /*3. Next info*/ 685 /*3. Next info */
569 } 686 }
687
570 /* Send resulting state */ 688 /* Send resulting state */
571 strcpy (cmdback,"ExtendedTextSet"); 689 strcpy (cmdback, "ExtendedTextSet");
690
572 for (i=0;i<=MSG_TYPE_LAST;i++) 691 for (i = 0; i <= MSG_TYPE_LAST; i++)
573 if (ns->supported_readables &(1<<i)){ 692 if (ns->supported_readables & (1 << i))
693 {
574 strcat (cmdback," "); 694 strcat (cmdback, " ");
575 snprintf(temp,sizeof(temp),"%d",i); 695 snprintf (temp, sizeof (temp), "%d", i);
576 strcat (cmdback,temp); 696 strcat (cmdback, temp);
577 } 697 }
578 Write_String_To_Socket(ns, cmdback,strlen(cmdback)); 698
699 ns->send_packet (cmdback);
579} 700}
580 701
581/** 702/**
582 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 703 * A lot like the old AskSmooth (in fact, now called by AskSmooth).
583 * Basically, it makes no sense to wait for the client to request a 704 * Basically, it makes no sense to wait for the client to request a
584 * a piece of data from us that we know the client wants. So 705 * a piece of data from us that we know the client wants. So
585 * if we know the client wants it, might as well push it to the 706 * if we know the client wants it, might as well push it to the
586 * client. 707 * client.
587 */ 708 */
588static void SendSmooth(NewSocket *ns, uint16 face) { 709static void
710SendSmooth (client * ns, uint16 face)
711{
589 uint16 smoothface; 712 uint16 smoothface;
590 unsigned char reply[MAX_BUF];
591 SockList sl;
592 713
593 /* If we can't find a face, return and set it so we won't try to send this 714 /* If we can't find a face, return and set it so we won't try to send this
594 * again. 715 * again.
595 */ 716 */
596 if ((!FindSmooth (face, &smoothface)) && 717 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
597 (!FindSmooth ( smooth_face->number, &smoothface))) { 718 {
598 719
599 LOG(llevError,"could not findsmooth for %d. Neither default (%s)\n",face,smooth_face->name); 720 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name);
600 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 721 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
601 return; 722 return;
602 } 723 }
603 724
604 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 725 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
605 esrv_send_face(ns, smoothface, 0); 726 esrv_send_face (ns, smoothface, 0);
606 727
607 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 728 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
608 729
609 sl.buf=reply; 730 packet sl;
610 strcpy((char*)sl.buf,"smooth "); 731
611 sl.len=strlen((char*)sl.buf); 732 sl << "smooth "
612 SockList_AddShort(&sl, face); 733 << uint16 (face)
613 SockList_AddShort(&sl, smoothface); 734 << uint16 (smoothface);
614 Send_With_Handling(ns, &sl); 735
736 ns->send_packet (sl);
615} 737}
616 738
617 /** 739 /**
618 * Tells client the picture it has to use 740 * Tells client the picture it has to use
619 * to smooth a picture number given as argument. 741 * to smooth a picture number given as argument.
620 */ 742 */
743void
621void AskSmooth (char *buf, int len, NewSocket *ns){ 744AskSmooth (char *buf, int len, client * ns)
745{
622 uint16 facenbr; 746 uint16 facenbr;
623 747
624 facenbr=atoi (buf); 748 facenbr = atoi (buf);
625 SendSmooth(ns, facenbr); 749 SendSmooth (ns, facenbr);
626} 750}
627
628
629
630
631 751
632/** 752/**
633 * This handles the general commands from the client (ie, north, fire, cast, 753 * This handles the general commands from the client (ie, north, fire, cast,
634 * etc.) 754 * etc.)
635 */ 755 */
756void
636void PlayerCmd(char *buf, int len, player *pl) 757PlayerCmd (char *buf, int len, player *pl)
637{ 758{
638 759
639 /* The following should never happen with a proper or honest client. 760 /* The following should never happen with a proper or honest client.
640 * Therefore, the error message doesn't have to be too clear - if 761 * Therefore, the error message doesn't have to be too clear - if
641 * someone is playing with a hacked/non working client, this gives them 762 * someone is playing with a hacked/non working client, this gives them
642 * an idea of the problem, but they deserve what they get 763 * an idea of the problem, but they deserve what they get
643 */ 764 */
644 if (pl->state!=ST_PLAYING) { 765 if (pl->state != ST_PLAYING)
645 new_draw_info_format(NDI_UNIQUE, 0,pl->ob,
646 "You can not issue commands - state is not ST_PLAYING (%s)", buf);
647 return;
648 } 766 {
767 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
768 return;
769 }
649 /* Check if there is a count. In theory, a zero count could also be 770 /* Check if there is a count. In theory, a zero count could also be
650 * sent, so check for that also. 771 * sent, so check for that also.
651 */ 772 */
652 if (atoi(buf) || buf[0]=='0') { 773 if (atoi (buf) || buf[0] == '0')
774 {
653 pl->count=atoi((char*)buf); 775 pl->count = atoi ((char *) buf);
654 buf=strchr(buf,' '); /* advance beyond the numbers */ 776 buf = strchr (buf, ' '); /* advance beyond the numbers */
655 if (!buf) { 777 if (!buf)
778 {
656#ifdef ESRV_DEBUG 779#ifdef ESRV_DEBUG
657 LOG(llevDebug,"PlayerCmd: Got count but no command.\n"); 780 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
658#endif 781#endif
659 return; 782 return;
660 } 783 }
661 buf++; 784 buf++;
662 } 785 }
663 /* This should not happen anymore. */ 786 /* This should not happen anymore. */
664 if (pl->ob->speed_left<-1.0) { 787 if (pl->ob->speed_left < -1.0)
788 {
665 LOG(llevError,"Player has negative time - shouldn't do command.\n"); 789 LOG (llevError, "Player has negative time - shouldn't do command.\n");
666 } 790 }
667 /* In c_new.c */ 791 /* In c_new.c */
668 execute_newserver_command(pl->ob, (char*)buf); 792 execute_newserver_command (pl->ob, (char *) buf);
669 /* Perhaps something better should be done with a left over count. 793 /* Perhaps something better should be done with a left over count.
670 * Cleaning up the input should probably be done first - all actions 794 * Cleaning up the input should probably be done first - all actions
671 * for the command that issued the count should be done before any other 795 * for the command that issued the count should be done before any other
672 * commands. 796 * commands.
673 */ 797 */
674 798
675 pl->count=0; 799 pl->count = 0;
676 800
677} 801}
678 802
679 803
680/** 804/**
681 * This handles the general commands from the client (ie, north, fire, cast, 805 * This handles the general commands from the client (ie, north, fire, cast,
682 * etc.). It is a lot like PlayerCmd above, but is called with the 806 * etc.). It is a lot like PlayerCmd above, but is called with the
683 * 'ncom' method which gives more information back to the client so it 807 * 'ncom' method which gives more information back to the client so it
684 * can throttle. 808 * can throttle.
685 */ 809 */
810void
686void NewPlayerCmd(uint8 *buf, int len, player *pl) 811NewPlayerCmd (char *buf, int len, player *pl)
687{ 812{
688 int time,repeat; 813 int time, repeat;
689 short packet;
690 unsigned char command[MAX_BUF]; 814 char command[MAX_BUF];
691 SockList sl; 815 int pktlen;
692 816
693 if (len < 7) { 817 if (len < 7)
818 {
694 LOG(llevDebug,"Corrupt ncom command <%s> not long enough - discarding\n", buf); 819 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
695 return; 820 return;
696 } 821 }
697 822
698 packet = GetShort_String(buf); 823 pktlen = net_uint16 ((uint8 *)buf);
699 repeat = GetInt_String(buf+2); 824 repeat = net_uint32 ((uint8 *)buf + 2);
825
700 /* -1 is special - no repeat, but don't update */ 826 /* -1 is special - no repeat, but don't update */
701 if (repeat!=-1) { 827 if (repeat != -1)
702 pl->count=repeat; 828 pl->count = repeat;
703 }
704 if ((len-4) >= MAX_BUF) len=MAX_BUF-5;
705 829
830 if ((len - 4) >= MAX_BUF)
831 len = MAX_BUF - 5;
832
706 strncpy((char*)command, (char*)buf+6, len-4); 833 strncpy ((char *) command, (char *) buf + 6, len - 4);
707 command[len-4]='\0'; 834 command[len - 4] = 0;
708 835
709 /* The following should never happen with a proper or honest client.
710 * Therefore, the error message doesn't have to be too clear - if
711 * someone is playing with a hacked/non working client, this gives them
712 * an idea of the problem, but they deserve what they get
713 */
714 if (pl->state!=ST_PLAYING) {
715 new_draw_info_format(NDI_UNIQUE, 0,pl->ob,
716 "You can not issue commands - state is not ST_PLAYING (%s)", buf);
717 return;
718 }
719
720 /* This should not happen anymore. */ 836 /* This should not happen anymore. */
721 if (pl->ob->speed_left<-1.0) { 837 if (pl->ob->speed_left < -1.0)
722 LOG(llevError,"Player has negative time - shouldn't do command.\n"); 838 LOG (llevError, "Player has negative time - shouldn't do command.\n");
723 } 839
724 /* In c_new.c */ 840 /* In c_new.c */
725 execute_newserver_command(pl->ob, (char*)command); 841 execute_newserver_command (pl->ob, (char *) command);
726 /* Perhaps something better should be done with a left over count. 842 /* Perhaps something better should be done with a left over count.
727 * Cleaning up the input should probably be done first - all actions 843 * Cleaning up the input should probably be done first - all actions
728 * for the command that issued the count should be done before any other 844 * for the command that issued the count should be done before any other
729 * commands. 845 * commands.
730 */ 846 */
731 pl->count=0; 847 pl->count = 0;
732 848
849 if (FABS (pl->ob->speed) < 0.001)
850 time = MAX_TIME * 100;
851 else
852 time = (int) (MAX_TIME / FABS (pl->ob->speed));
853
733 /* Send confirmation of command execution now */ 854 /* Send confirmation of command execution now */
734 sl.buf = command; 855
735 strcpy((char*)sl.buf,"comc "); 856 packet sl;
736 sl.len=5; 857 sl << "comc " << uint16 (pktlen) << uint32 (time);
737 SockList_AddShort(&sl,packet); 858 pl->socket->send_packet (sl);
738 if (FABS(pl->ob->speed) < 0.001) time=MAX_TIME * 100;
739 else
740 time = ( int )( MAX_TIME/ FABS(pl->ob->speed) );
741 SockList_AddInt(&sl,time);
742 Send_With_Handling(&pl->socket, &sl);
743} 859}
744 860
745 861
746/** This is a reply to a previous query. */ 862/** This is a reply to a previous query. */
863void
747void ReplyCmd(char *buf, int len, player *pl) 864ReplyCmd (char *buf, int len, player *pl)
748{ 865{
749 /* This is to synthesize how the data would be stored if it 866 /* This is to synthesize how the data would be stored if it
750 * was normally entered. A bit of a hack, and should be cleaned up 867 * was normally entered. A bit of a hack, and should be cleaned up
751 * once all the X11 code is removed from the server. 868 * once all the X11 code is removed from the server.
752 * 869 *
753 * We pass 13 to many of the functions because this way they 870 * We pass 13 to many of the functions because this way they
754 * think it was the carriage return that was entered, and the 871 * think it was the carriage return that was entered, and the
755 * function then does not try to do additional input. 872 * function then does not try to do additional input.
756 */ 873 */
757 snprintf(pl->write_buf, sizeof(pl->write_buf), ":%s", buf); 874 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
758 875
759 /* this avoids any hacking here */ 876 /* this avoids any hacking here */
760 877
761 switch (pl->state) { 878 switch (pl->state)
879 {
762 case ST_PLAYING: 880 case ST_PLAYING:
763 LOG(llevError,"Got reply message with ST_PLAYING input state\n"); 881 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
764 break; 882 break;
765 883
766 case ST_PLAY_AGAIN: 884 case ST_PLAY_AGAIN:
767 /* We can check this for return value (2==quit). Maybe we 885 /* We can check this for return value (2==quit). Maybe we
768 * should, and do something appropriate? 886 * should, and do something appropriate?
769 */ 887 */
770 receive_play_again(pl->ob, buf[0]); 888 receive_play_again (pl->ob, buf[0]);
771 break; 889 break;
772 890
773 case ST_ROLL_STAT: 891 case ST_ROLL_STAT:
774 key_roll_stat(pl->ob,buf[0]); 892 key_roll_stat (pl->ob, buf[0]);
775 break; 893 break;
776 894
777 case ST_CHANGE_CLASS: 895 case ST_CHANGE_CLASS:
778 896
779 key_change_class(pl->ob, buf[0]); 897 key_change_class (pl->ob, buf[0]);
780 break; 898 break;
781 899
782 case ST_CONFIRM_QUIT: 900 case ST_CONFIRM_QUIT:
783 key_confirm_quit(pl->ob, buf[0]); 901 key_confirm_quit (pl->ob, buf[0]);
784 break; 902 break;
785 903
786 case ST_CONFIGURE: 904 case ST_CONFIGURE:
787 LOG(llevError,"In client input handling, but into configure state\n"); 905 LOG (llevError, "In client input handling, but into configure state\n");
788 pl->state = ST_PLAYING; 906 pl->state = ST_PLAYING;
789 break; 907 break;
790 908
791 case ST_GET_NAME: 909 case ST_GET_NAME:
792 receive_player_name(pl->ob,13); 910 receive_player_name (pl->ob, 13);
793 break; 911 break;
794 912
795 case ST_GET_PASSWORD: 913 case ST_GET_PASSWORD:
796 case ST_CONFIRM_PASSWORD: 914 case ST_CONFIRM_PASSWORD:
797 receive_player_password(pl->ob,13); 915 receive_player_password (pl->ob, 13);
798 break; 916 break;
799 917
800 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 918 case ST_GET_PARTY_PASSWORD: /* Get password for party */
801 receive_party_password(pl->ob,13); 919 receive_party_password (pl->ob, 13);
802 break; 920 break;
803 921
804 default: 922 default:
805 LOG(llevError,"Unknown input state: %d\n", pl->state); 923 LOG (llevError, "Unknown input state: %d\n", pl->state);
806 } 924 }
807} 925}
808 926
809/** 927/**
810 * Client tells its version. If there is a mismatch, we close the 928 * Client tells its version. If there is a mismatch, we close the
811 * socket. In real life, all we should care about is the client having 929 * socket. In real life, all we should care about is the client having
812 * something older than the server. If we assume the client will be 930 * something older than the server. If we assume the client will be
813 * backwards compatible, having it be a later version should not be a 931 * backwards compatible, having it be a later version should not be a
814 * problem. 932 * problem.
815 */ 933 */
934void
816void VersionCmd(char *buf, int len,NewSocket *ns) 935VersionCmd (char *buf, int len, client * ns)
817{ 936{
818 char *cp; 937 char *cp;
819 char version_warning[256]; 938 char version_warning[256];
820 939
821 if (!buf) { 940 if (!buf)
941 {
822 LOG(llevError, "CS: received corrupted version command\n"); 942 LOG (llevError, "CS: received corrupted version command\n");
823 return; 943 return;
824 } 944 }
825 945
826 ns->cs_version = atoi(buf); 946 ns->cs_version = atoi (buf);
827 ns->sc_version = ns->cs_version; 947 ns->sc_version = ns->cs_version;
828 if (VERSION_CS != ns->cs_version) { 948 if (VERSION_CS != ns->cs_version)
949 {
829#ifdef ESRV_DEBUG 950#ifdef ESRV_DEBUG
830 LOG(llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS,ns->cs_version); 951 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
831#endif 952#endif
832 } 953 }
833 cp = strchr(buf+1,' '); 954 cp = strchr (buf + 1, ' ');
834 if (!cp) return; 955 if (!cp)
956 return;
835 ns->sc_version = atoi(cp); 957 ns->sc_version = atoi (cp);
836 if (VERSION_SC != ns->sc_version) { 958 if (VERSION_SC != ns->sc_version)
959 {
837#ifdef ESRV_DEBUG 960#ifdef ESRV_DEBUG
838 LOG(llevDebug, "CS: scversion mismatch (%d,%d)\n",VERSION_SC,ns->sc_version); 961 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
839#endif 962#endif
840 } 963 }
841 cp = strchr(cp+1, ' '); 964 cp = strchr (cp + 1, ' ');
842 if (cp) { 965 if (cp)
966 {
843 LOG(llevDebug,"CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 967 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);
844 968
845 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1); 969 assign (ns->version, cp + 1);
846 970
847 /* This is first implementation - i skip all beta DX clients with it 971 if (ns->sc_version < 1026)
848 * Add later stuff here for other clients 972 {
849 */ 973 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
850 974 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
851 /* these are old dxclients */ 975 ns->send_packet (version_warning);
852 /* Version 1024 added support for singular + plural name values - 976 }
853 * requiing this minimal value reduces complexity of that code, and it
854 * has been around for a long time.
855 */
856 if(!strcmp(" CF DX CLIENT", cp) || ns->sc_version < 1024 )
857 {
858 sprintf(version_warning,"drawinfo %d %s", NDI_RED, "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
859 Write_String_To_Socket(ns, version_warning, strlen(version_warning));
860 }
861 977
862 } 978 }
863} 979}
864 980
865/** sound related functions. */ 981/** sound related functions. */
866 982void
867void SetSound(char *buf, int len, NewSocket *ns) 983SetSound (char *buf, int len, client * ns)
868{ 984{
869 ns->sound = atoi(buf); 985 ns->sound = atoi (buf);
870} 986}
871 987
872/** client wants the map resent */ 988/** client wants the map resent */
873 989
990void
874void MapRedrawCmd(char *buf, int len, player *pl) 991MapRedrawCmd (char *buf, int len, player *pl)
875{ 992{
993
876/* This function is currently disabled; just clearing the map state results in 994/* This function is currently disabled; just clearing the map state results in
877 * display errors. It should clear the cache and send a newmap command. 995 * display errors. It should clear the cache and send a newmap command.
878 * Unfortunately this solution does not work because some client versions send 996 * Unfortunately this solution does not work because some client versions send
879 * a mapredraw command after receiving a newmap command. 997 * a mapredraw command after receiving a newmap command.
880 */ 998 */
881#if 0 999#if 0
882 /* Okay, this is MAJOR UGLY. but the only way I know how to 1000 /* Okay, this is MAJOR UGLY. but the only way I know how to
883 * clear the "cache" 1001 * clear the "cache"
884 */ 1002 */
885 memset(&pl->socket.lastmap, 0, sizeof(struct Map)); 1003 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
886 draw_client_map(pl->ob); 1004 draw_client_map (pl->ob);
887#endif 1005#endif
888} 1006}
889 1007
890/** 1008/**
891 * Moves an object (typically, container to inventory). 1009 * Moves an object (typically, container to inventory).
892 * syntax is: move (to) (tag) (nrof) 1010 * syntax is: move (to) (tag) (nrof)
893 */ 1011 */
1012void
894void MoveCmd(char *buf, int len,player *pl) 1013MoveCmd (char *buf, int len, player *pl)
895{ 1014{
896 int vals[3], i; 1015 int vals[3], i;
897 1016
898 /* A little funky here. We only cycle for 2 records, because 1017 /* A little funky here. We only cycle for 2 records, because
899 * we obviously am not going to find a space after the third 1018 * we obviously am not going to find a space after the third
900 * record. Perhaps we should just replace this with a 1019 * record. Perhaps we should just replace this with a
901 * sscanf? 1020 * sscanf?
902 */ 1021 */
903 for (i=0; i<2; i++) { 1022 for (i = 0; i < 2; i++)
1023 {
904 vals[i]=atoi(buf); 1024 vals[i] = atoi (buf);
905 if (!(buf = strchr(buf, ' '))) { 1025 if (!(buf = strchr (buf, ' ')))
1026 {
906 LOG(llevError,"Incomplete move command: %s\n", buf); 1027 LOG (llevError, "Incomplete move command: %s\n", buf);
907 return; 1028 return;
908 } 1029 }
909 buf++; 1030 buf++;
910 } 1031 }
911 vals[2]=atoi(buf); 1032 vals[2] = atoi (buf);
912 1033
913/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 1034/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
914 esrv_move_object(pl->ob,vals[0], vals[1], vals[2]); 1035 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
915} 1036}
916 1037
917 1038
918 1039
919/****************************************************************************** 1040/******************************************************************************
… …
924 1045
925/** 1046/**
926 * Asks the client to query the user. This way, the client knows 1047 * Asks the client to query the user. This way, the client knows
927 * it needs to send something back (vs just printing out a message) 1048 * it needs to send something back (vs just printing out a message)
928 */ 1049 */
1050void
929void send_query(NewSocket *ns, uint8 flags, char *text) 1051send_query (client * ns, uint8 flags, char *text)
930{ 1052{
931 char buf[MAX_BUF]; 1053 char buf[MAX_BUF];
932 1054
933 sprintf(buf,"query %d %s", flags, text?text:""); 1055 sprintf (buf, "query %d %s", flags, text ? text : "");
934 Write_String_To_Socket(ns, buf, strlen(buf)); 1056 ns->send_packet (buf);
935} 1057}
936 1058
937#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1059#define AddIfInt64(Old,New,Type) if (Old != New) {\
938 Old = New; \ 1060 Old = New; \
939 SockList_AddChar(&sl, Type); \ 1061 sl << uint8 (Type) << uint64 (New); \
940 SockList_AddInt64(&sl, New); \ 1062 }
941 }
942 1063
943#define AddIfInt(Old,New,Type) if (Old != New) {\ 1064#define AddIfInt(Old,New,Type) if (Old != New) {\
944 Old = New; \ 1065 Old = New; \
945 SockList_AddChar(&sl, Type); \ 1066 sl << uint8 (Type) << uint32 (New); \
946 SockList_AddInt(&sl, New); \ 1067 }
947 }
948 1068
949#define AddIfShort(Old,New,Type) if (Old != New) {\ 1069#define AddIfShort(Old,New,Type) if (Old != New) {\
950 Old = New; \ 1070 Old = New; \
951 SockList_AddChar(&sl, Type); \ 1071 sl << uint8 (Type) << uint16 (New); \
952 SockList_AddShort(&sl, New); \ 1072 }
953 }
954 1073
955#define AddIfFloat(Old,New,Type) if (Old != New) {\ 1074#define AddIfFloat(Old,New,Type) if (Old != New) {\
956 Old = New; \ 1075 Old = New; \
957 SockList_AddChar(&sl, Type); \ 1076 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \
958 SockList_AddInt(&sl,(long)(New*FLOAT_MULTI));\ 1077 }
959 }
960 1078
961#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 1079#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
962 if (Old) free(Old);\ 1080 free(Old); Old = strdup (New);\
963 Old = strdup_local(New);\ 1081 sl << uint8 (Type) << data8 (New); \
964 SockList_AddChar(&sl, Type); \ 1082 }
965 SockList_AddChar(&sl, ( char )strlen(New)); \
966 strcpy((char*)sl.buf + sl.len, New); \
967 sl.len += strlen(New); \
968 }
969 1083
970/** 1084/**
971 * Sends a statistics update. We look at the old values, 1085 * Sends a statistics update. We look at the old values,
972 * and only send what has changed. Stat mapping values are in newclient.h 1086 * and only send what has changed. Stat mapping values are in newclient.h
973 * Since this gets sent a lot, this is actually one of the few binary 1087 * Since this gets sent a lot, this is actually one of the few binary
974 * commands for now. 1088 * commands for now.
975 */ 1089 */
1090void
976void esrv_update_stats(player *pl) 1091esrv_update_stats (player *pl)
977{ 1092{
978 SockList sl;
979 char buf[MAX_BUF]; 1093 char buf[MAX_BUF];
980 uint16 flags; 1094 uint16 flags;
981 1095
982 sl.buf=(unsigned char*)malloc(MAXSOCKBUF); 1096 packet sl;
983 strcpy((char*)sl.buf,"stats "); 1097 sl << "stats ";
984 sl.len=strlen((char*)sl.buf); 1098
985
986 if(pl->ob != NULL) 1099 if (pl->ob != NULL)
987 { 1100 {
988 AddIfShort(pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1101 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
989 AddIfShort(pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1102 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
990 AddIfShort(pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1103 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);
991 AddIfShort(pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1104 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);
992 AddIfShort(pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1105 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);
993 AddIfShort(pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1106 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);
994 AddIfShort(pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1107 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);
995 AddIfShort(pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); 1108 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
996 AddIfShort(pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); 1109 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
997 AddIfShort(pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); 1110 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
998 AddIfShort(pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1111 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);
999 AddIfShort(pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1112 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1000 AddIfShort(pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1113 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1001 }
1002 if(pl->socket.exp64) {
1003 uint8 s;
1004 for(s=0;s<NUM_SKILLS;s++) {
1005 if (pl->last_skill_ob[s] &&
1006 pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) {
1007
1008 /* Always send along the level if exp changes. This is only
1009 * 1 extra byte, but keeps processing simpler.
1010 */
1011 SockList_AddChar(&sl, ( char )( s + CS_STAT_SKILLINFO ));
1012 SockList_AddChar(&sl, ( char )pl->last_skill_ob[s]->level);
1013 SockList_AddInt64(&sl, pl->last_skill_ob[s]->stats.exp);
1014 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1015 } 1114 }
1016 } 1115
1017 }
1018 if (pl->socket.exp64) { 1116 if (pl->socket->exp64)
1117 {
1118 uint8 s;
1119
1120 for (s = 0; s < NUM_SKILLS; s++)
1121 {
1122 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1123 {
1124 /* Always send along the level if exp changes. This is only
1125 * 1 extra byte, but keeps processing simpler.
1126 */
1127 sl << uint8 (s + CS_STAT_SKILLINFO)
1128 << uint8 (pl->last_skill_ob[s]->level)
1129 << uint64 (pl->last_skill_ob[s]->stats.exp);
1130
1131 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1132 }
1133 }
1134 }
1135
1136 if (pl->socket->exp64)
1019 AddIfInt64(pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); 1137 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1020 } else { 1138 else
1021 AddIfInt(pl->last_stats.exp, ( int )pl->ob->stats.exp, CS_STAT_EXP); 1139 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1022 } 1140
1023 AddIfShort(pl->last_level, ( char )pl->ob->level, CS_STAT_LEVEL); 1141 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
1024 AddIfShort(pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1142 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);
1025 AddIfShort(pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1143 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);
1026 AddIfShort(pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1144 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);
1027 AddIfFloat(pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1145 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
1028 AddIfShort(pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1146 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD);
1029 AddIfFloat(pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 1147 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1030 AddIfInt(pl->last_weight_limit, (sint32)weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); 1148 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);
1031 flags=0; 1149 flags = 0;
1032 if (pl->fire_on) flags |=SF_FIREON;
1033 if (pl->run_on) flags |= SF_RUNON;
1034 1150
1151 if (pl->fire_on)
1152 flags |= SF_FIREON;
1153
1154 if (pl->run_on)
1155 flags |= SF_RUNON;
1156
1035 AddIfShort(pl->last_flags, flags, CS_STAT_FLAGS); 1157 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1158
1036 if (pl->socket.sc_version<1025) { 1159 if (pl->socket->sc_version < 1025)
1037 AddIfShort(pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR); 1160 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1038 } else { 1161 else
1039 int i; 1162 {
1163 int i;
1040 1164
1041 for (i=0; i<NROFATTACKS; i++) { 1165 for (i = 0; i < NROFATTACKS; i++)
1166 {
1042 /* Skip ones we won't send */ 1167 /* Skip ones we won't send */
1043 if (atnr_cs_stat[i]==-1) continue; 1168 if (atnr_cs_stat[i] == -1)
1169 continue;
1170
1044 AddIfShort(pl->last_resist[i], pl->ob->resist[i], ( char )atnr_cs_stat[i]); 1171 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1045 } 1172 }
1046 } 1173 }
1174
1047 if (pl->socket.monitor_spells) { 1175 if (pl->socket->monitor_spells)
1176 {
1048 AddIfInt(pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1177 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1049 AddIfInt(pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1178 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
1050 AddIfInt(pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1179 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1051 } 1180 }
1181
1052 rangetostring(pl->ob, buf); /* we want use the new fire & run system in new client */ 1182 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */
1053 AddIfString(pl->socket.stats.range, buf, CS_STAT_RANGE); 1183 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);
1054 set_title(pl->ob, buf); 1184 set_title (pl->ob, buf);
1055 AddIfString(pl->socket.stats.title, buf, CS_STAT_TITLE); 1185 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);
1056 1186
1057 /* Only send it away if we have some actual data */ 1187 /* Only send it away if we have some actual data */
1058 if (sl.len>6) { 1188 if (sl.length () > 6)
1059#ifdef ESRV_DEBUG 1189 pl->socket->send_packet (sl);
1060 LOG(llevDebug,"Sending stats command, %d bytes long.\n", sl.len);
1061#endif
1062 Send_With_Handling(&pl->socket, &sl);
1063 }
1064 free(sl.buf);
1065} 1190}
1066
1067 1191
1068/** 1192/**
1069 * Tells the client that here is a player it should start using. 1193 * Tells the client that here is a player it should start using.
1070 */ 1194 */
1195void
1071void esrv_new_player(player *pl, uint32 weight) 1196esrv_new_player (player *pl, uint32 weight)
1072{ 1197{
1073 SockList sl;
1074
1075 pl->last_weight = weight; 1198 pl->last_weight = weight;
1076 1199
1077 sl.buf=(unsigned char*)malloc(MAXSOCKBUF); 1200 packet sl;
1201 sl << "player ";
1078 1202
1079 strcpy((char*)sl.buf,"player "); 1203 sl << uint32 (pl->ob->count)
1080 sl.len=strlen((char*)sl.buf); 1204 << uint32 (weight)
1081 SockList_AddInt(&sl, pl->ob->count); 1205 << uint32 (pl->ob->face->number)
1082 SockList_AddInt(&sl, weight); 1206 << data8 (pl->ob->name);
1083 SockList_AddInt(&sl, pl->ob->face->number);
1084 1207
1085 SockList_AddChar(&sl, ( char )strlen(pl->ob->name)); 1208 pl->socket->send_packet (sl);
1086 strcpy((char*)sl.buf+sl.len, pl->ob->name);
1087 sl.len += strlen(pl->ob->name);
1088
1089 Send_With_Handling(&pl->socket, &sl);
1090 free(sl.buf);
1091 SET_FLAG(pl->ob, FLAG_CLIENT_SENT); 1209 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1092} 1210}
1093
1094 1211
1095/** 1212/**
1096 * Need to send an animation sequence to the client. 1213 * Need to send an animation sequence to the client.
1097 * We will send appropriate face commands to the client if we haven't 1214 * We will send appropriate face commands to the client if we haven't
1098 * sent them the face yet (this can become quite costly in terms of 1215 * sent them the face yet (this can become quite costly in terms of
1099 * how much we are sending - on the other hand, this should only happen 1216 * how much we are sending - on the other hand, this should only happen
1100 * when the player logs in and picks stuff up. 1217 * when the player logs in and picks stuff up.
1101 */ 1218 */
1219void
1102void esrv_send_animation(NewSocket *ns, short anim_num) 1220esrv_send_animation (client * ns, short anim_num)
1103{ 1221{
1104 SockList sl;
1105 int i; 1222 int i;
1106 1223
1107 /* Do some checking on the anim_num we got. Note that the animations 1224 /* Do some checking on the anim_num we got. Note that the animations
1108 * are added in contigous order, so if the number is in the valid 1225 * are added in contigous order, so if the number is in the valid
1109 * range, it must be a valid animation. 1226 * range, it must be a valid animation.
1110 */ 1227 */
1111 if (anim_num < 0 || anim_num > num_animations) { 1228 if (anim_num < 0 || anim_num > num_animations)
1229 {
1112 LOG(llevError,"esrv_send_anim (%d) out of bounds??\n",anim_num); 1230 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1113 return; 1231 return;
1114 } 1232 }
1115 1233
1116 sl.buf = (unsigned char*) malloc(MAXSOCKBUF); 1234 packet sl;
1117 strcpy((char*)sl.buf, "anim "); 1235
1118 sl.len=5; 1236 sl << "anim "
1119 SockList_AddShort(&sl, anim_num); 1237 << uint16 (anim_num)
1120 SockList_AddShort(&sl, 0); /* flags - not used right now */ 1238 << uint16 (0); /* flags - not used right now */
1239
1121 /* Build up the list of faces. Also, send any information (ie, the 1240 /* Build up the list of faces. Also, send any information (ie, the
1122 * the face itself) down to the client. 1241 * the face itself) down to the client.
1123 */ 1242 */
1124 for (i=0; i<animations[anim_num].num_animations; i++) { 1243 for (i = 0; i < animations[anim_num].num_animations; i++)
1244 {
1125 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1245 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1126 esrv_send_face(ns,animations[anim_num].faces[i],0); 1246 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1127 SockList_AddShort(&sl, animations[anim_num].faces[i]); /* flags - not used right now */ 1247 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1128 } 1248 }
1129 Send_With_Handling(ns, &sl); 1249
1130 free(sl.buf); 1250 ns->send_packet (sl);
1251
1131 ns->anims_sent[anim_num] = 1; 1252 ns->anims_sent[anim_num] = 1;
1132} 1253}
1133 1254
1134 1255
1135/****************************************************************************** 1256/******************************************************************************
1136 * 1257 *
… …
1140 1261
1141/** 1262/**
1142 * This adds face_num to a map cell at x,y. If the client doesn't have 1263 * This adds face_num to a map cell at x,y. If the client doesn't have
1143 * the face yet, we will also send it. 1264 * the face yet, we will also send it.
1144 */ 1265 */
1145static void esrv_map_setbelow(NewSocket *ns, int x,int y, 1266static void
1146 short face_num, struct Map *newmap) 1267esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1147{ 1268{
1148 if(newmap->cells[x][y].count >= MAP_LAYERS) { 1269 if (newmap->cells[x][y].count >= MAP_LAYERS)
1270 {
1149 LOG(llevError,"Too many faces in map cell %d %d\n",x,y); 1271 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1150 return; 1272 return;
1151 abort(); 1273 abort ();
1152 } 1274 }
1275
1153 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1276 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1154 newmap->cells[x][y].count ++; 1277 newmap->cells[x][y].count++;
1278
1155 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1279 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1156 esrv_send_face(ns,face_num,0); 1280 esrv_send_face (ns, face_num, 0);
1157} 1281}
1158 1282
1159struct LayerCell { 1283struct LayerCell
1284{
1160 uint16 xy; 1285 uint16 xy;
1161 short face; 1286 short face;
1162}; 1287};
1163 1288
1164struct MapLayer { 1289struct MapLayer
1290{
1165 int count; 1291 int count;
1166 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; 1292 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1167}; 1293};
1168 1294
1169/** Checkes if map cells have changed */ 1295/** Checkes if map cells have changed */
1296static int
1170static int mapcellchanged(NewSocket *ns,int i,int j, struct Map *newmap) 1297mapcellchanged (client * ns, int i, int j, struct Map *newmap)
1171{ 1298{
1172 int k; 1299 int k;
1173 1300
1174 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) 1301 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1175 return 1; 1302 return 1;
1176 for(k=0;k<newmap->cells[i][j].count;k++) { 1303 for (k = 0; k < newmap->cells[i][j].count; k++)
1177 if (ns->lastmap.cells[i][j].faces[k] != 1304 {
1178 newmap->cells[i][j].faces[k]) { 1305 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1306 {
1179 return 1; 1307 return 1;
1180 } 1308 }
1181 } 1309 }
1182 return 0; 1310 return 0;
1183} 1311}
1184 1312
1185/** 1313/**
1186 * Basically, what this does is pack the data into layers. 1314 * Basically, what this does is pack the data into layers.
1187 * cnum is the client number, cur is the the buffer we put all of 1315 * cnum is the client number, cur is the the buffer we put all of
1188 * this data into. we return the end of the data. layers is 1316 * this data into. we return the end of the data. layers is
1189 * how many layers of data we should back. 1317 * how many layers of data we should back.
1190 */ 1318 */
1191static uint8 *compactlayer(NewSocket *ns, unsigned char *cur, int numlayers, 1319static uint8 *
1192 struct Map *newmap) 1320compactlayer (client * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1193{ 1321{
1194 int x,y,k; 1322 int x, y, k;
1195 int face; 1323 int face;
1196 unsigned char *fcur; 1324 unsigned char *fcur;
1197 struct MapLayer layers[MAP_LAYERS]; 1325 struct MapLayer layers[MAP_LAYERS];
1198 1326
1199 for(k = 0;k<MAP_LAYERS;k++) 1327 for (k = 0; k < MAP_LAYERS; k++)
1200 layers[k].count = 0; 1328 layers[k].count = 0;
1201 fcur = cur; 1329 fcur = cur;
1202 for(x=0;x<ns->mapx;x++) { 1330 for (x = 0; x < ns->mapx; x++)
1203 for(y=0;y<ns->mapy;y++) { 1331 {
1332 for (y = 0; y < ns->mapy; y++)
1333 {
1204 if (!mapcellchanged(ns,x,y,newmap)) 1334 if (!mapcellchanged (ns, x, y, newmap))
1205 continue; 1335 continue;
1206 if (newmap->cells[x][y].count == 0) { 1336 if (newmap->cells[x][y].count == 0)
1337 {
1207 *cur = x*ns->mapy+y; /* mark empty space */ 1338 *cur = x * ns->mapy + y; /* mark empty space */
1208 cur++; 1339 cur++;
1209 continue; 1340 continue;
1341 }
1342 for (k = 0; k < newmap->cells[x][y].count; k++)
1343 {
1344 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1345 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1346 layers[k].count++;
1347 }
1348 }
1210 } 1349 }
1211 for(k=0;k<newmap->cells[x][y].count;k++) {
1212 layers[k].lcells[layers[k].count].xy = x*ns->mapy+y;
1213 layers[k].lcells[layers[k].count].face =
1214 newmap->cells[x][y].faces[k];
1215 layers[k].count++;
1216 }
1217 }
1218 }
1219 /* If no data, return now. */ 1350 /* If no data, return now. */
1220 if (fcur == cur && layers[0].count == 0) 1351 if (fcur == cur && layers[0].count == 0)
1221 return cur;
1222 *cur = 255; /* mark end of explicitly cleared cells */
1223 cur++;
1224 /* First pack by layers. */
1225 for(k=0;k<numlayers;k++) {
1226 if (layers[k].count == 0)
1227 break; /* once a layer is entirely empty, no layer below it can
1228 have anything in it either */
1229 /* Pack by entries in thie layer */
1230 for(x=0;x<layers[k].count;) {
1231 fcur = cur;
1232 *cur = layers[k].lcells[x].face >> 8;
1233 cur++;
1234 *cur = layers[k].lcells[x].face & 0xFF;
1235 cur++;
1236 face = layers[k].lcells[x].face;
1237 /* Now, we back the redundant data into 1 byte xy pairings */
1238 for(y=x;y<layers[k].count;y++) {
1239 if (layers[k].lcells[y].face == face) {
1240 *cur = ( uint8 )layers[k].lcells[y].xy;
1241 cur++;
1242 layers[k].lcells[y].face = -1;
1243 }
1244 }
1245 *(cur-1) = *(cur-1) | 128; /* mark for end of xy's; 11*11 < 128 */
1246 /* forward over the now redundant data */
1247 while(x < layers[k].count &&
1248 layers[k].lcells[x].face == -1)
1249 x++;
1250 }
1251 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1252 }
1253 return cur; 1352 return cur;
1254} 1353 *cur = 255; /* mark end of explicitly cleared cells */
1255 1354 cur++;
1256static void esrv_map_doneredraw(NewSocket *ns, struct Map *newmap) 1355 /* First pack by layers. */
1257{ 1356 for (k = 0; k < numlayers; k++)
1258 static long frames,bytes,tbytes,tframes;
1259 char *cur;
1260 SockList sl;
1261
1262
1263 sl.buf=(unsigned char*)malloc(MAXSOCKBUF);
1264 strcpy((char*)sl.buf,"map ");
1265 sl.len=strlen((char*)sl.buf);
1266
1267 cur = (char *) compactlayer(ns,(unsigned char*) sl.buf+sl.len,MAP_LAYERS,newmap);
1268 sl.len=cur-(char*)sl.buf;
1269
1270/* LOG(llevDebug, "Sending map command.\n");*/
1271
1272 if (sl.len>( int )strlen("map ") || ns->sent_scroll) {
1273 /* All of this is just accounting stuff */
1274 if (tframes>100) {
1275 tframes = tbytes = 0;
1276 }
1277 tframes++;
1278 frames++;
1279 tbytes += sl.len;
1280 bytes += sl.len;
1281 memcpy(&ns->lastmap,newmap,sizeof(struct Map));
1282 Send_With_Handling(ns, &sl);
1283 ns->sent_scroll = 0;
1284 } 1357 {
1285 free(sl.buf); 1358 if (layers[k].count == 0)
1359 break; /* once a layer is entirely empty, no layer below it can
1360 have anything in it either */
1361 /* Pack by entries in thie layer */
1362 for (x = 0; x < layers[k].count;)
1363 {
1364 fcur = cur;
1365 *cur = layers[k].lcells[x].face >> 8;
1366 cur++;
1367 *cur = layers[k].lcells[x].face & 0xFF;
1368 cur++;
1369 face = layers[k].lcells[x].face;
1370 /* Now, we back the redundant data into 1 byte xy pairings */
1371 for (y = x; y < layers[k].count; y++)
1372 {
1373 if (layers[k].lcells[y].face == face)
1374 {
1375 *cur = (uint8) layers[k].lcells[y].xy;
1376 cur++;
1377 layers[k].lcells[y].face = -1;
1378 }
1379 }
1380 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1381 /* forward over the now redundant data */
1382 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1383 x++;
1384 }
1385 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1386 }
1387 return cur;
1286} 1388}
1287
1288 1389
1289/** Clears a map cell */ 1390/** Clears a map cell */
1391static void
1290static void map_clearcell(struct MapCell *cell, int face0, int face1, int face2, int count) 1392map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1291{ 1393{
1292 cell->faces[0] = face0; 1394 cell->faces[0] = face0;
1293 cell->faces[1] = face1; 1395 cell->faces[1] = face1;
1294 cell->faces[2] = face2; 1396 cell->faces[2] = face2;
1295 cell->count = count; 1397 cell->count = count;
1296 cell->stat_hp = 0; 1398 cell->stat_hp = 0;
1399 cell->flags = 0;
1400 cell->player = 0;
1297} 1401}
1298 1402
1299#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) 1403#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1300#define MAX_LAYERS 3 1404#define MAX_LAYERS 3
1301 1405
… …
1304 * and saves the space of allocating this in the socket object when we only 1408 * and saves the space of allocating this in the socket object when we only
1305 * need it for this cycle. If the serve is ever threaded, this needs to be 1409 * need it for this cycle. If the serve is ever threaded, this needs to be
1306 * re-examined. 1410 * re-examined.
1307 */ 1411 */
1308 1412
1309static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1413static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1310 1414
1311/** 1415/**
1312 * Returns true if any of the heads for this 1416 * Returns true if any of the heads for this
1313 * space is set. Returns false if all are blank - this is used 1417 * space is set. Returns false if all are blank - this is used
1314 * for empty space checking. 1418 * for empty space checking.
1315 */ 1419 */
1316static inline int have_head(int ax, int ay) { 1420static inline int
1421have_head (int ax, int ay)
1422{
1317 1423
1318 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1424 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1319 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || 1425 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1320 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) return 1;
1321 return 0; 1426 return 1;
1427 return 0;
1322} 1428}
1323 1429
1324/** 1430/**
1325 * check_head is a bit simplistic version of update_space below. 1431 * check_head is a bit simplistic version of update_space below.
1326 * basically, it only checks the that the head on space ax,ay at layer 1432 * basically, it only checks the that the head on space ax,ay at layer
1327 * needs to get sent - if so, it adds the data, sending the head 1433 * needs to get sent - if so, it adds the data, sending the head
1328 * if needed, and returning 1. If this no data needs to get 1434 * if needed, and returning 1. If this no data needs to get
1329 * sent, it returns zero. 1435 * sent, it returns zero.
1330 */ 1436 */
1437static int
1331static int check_head (SockList &sl, NewSocket &ns, int ax, int ay, int layer) 1438check_head (packet &sl, client &ns, int ax, int ay, int layer)
1332{ 1439{
1333 short face_num; 1440 short face_num;
1334 1441
1335 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1442 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1336 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1443 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1337 else 1444 else
1338 face_num = 0; 1445 face_num = 0;
1339 1446
1340 if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) { 1447 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1341 SockList_AddShort (&sl, face_num); 1448 {
1449 sl << uint16 (face_num);
1342 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1450 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1343 esrv_send_face (&ns, face_num, 0); 1451 esrv_send_face (&ns, face_num, 0);
1452
1344 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; 1453 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1345 ns.lastmap.cells[ax][ay].faces[layer] = face_num; 1454 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1346 return 1; 1455 return 1;
1347 } 1456 }
1348 1457
1349 return 0; /* No change */ 1458 return 0; /* No change */
1350} 1459}
1351 1460
1352/** 1461/**
1353 * Removes the need to replicate the same code for each layer. 1462 * Removes the need to replicate the same code for each layer.
1354 * this returns true if this space is now in fact different than 1463 * this returns true if this space is now in fact different than
… …
1367 * the map command, where the faces stack up. Sinces that is no longer 1476 * the map command, where the faces stack up. Sinces that is no longer
1368 * the case, it seems to make more sense to have these layer values 1477 * the case, it seems to make more sense to have these layer values
1369 * actually match. 1478 * actually match.
1370 */ 1479 */
1371 1480
1372static int update_space(SockList *sl, NewSocket *ns, mapstruct *mp, int mx, int my, int sx, int sy, int layer) 1481static int
1482update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1373{ 1483{
1374 object *ob, *head; 1484 object *ob, *head;
1375 uint16 face_num; 1485 uint16 face_num;
1376 int bx, by,i; 1486 int bx, by, i;
1377 1487
1378 /* If there is a multipart object stored away, treat that as more important. 1488 /* If there is a multipart object stored away, treat that as more important.
1379 * If not, then do the normal processing. 1489 * If not, then do the normal processing.
1380 */ 1490 */
1381
1382 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; 1491 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1383 1492
1384 /* Check to see if this head is part of the set of objects 1493 /* Check to see if this head is part of the set of objects
1385 * we would normally send for this space. If so, then 1494 * we would normally send for this space. If so, then
1386 * don't use the head value. We need to do the check 1495 * don't use the head value. We need to do the check
1387 * here and not when setting up the heads[] value for two reasons - 1496 * here and not when setting up the heads[] value for two reasons -
1388 * 1) the heads[] values will get used even if the space is not visible. 1497 * 1) the heads[] values will get used even if the space is not visible.
1389 * 2) its possible the head is not on the same map as a part, and I'd 1498 * 2) its possible the head is not on the same map as a part, and I'd
1390 * rather not need to do the map translation overhead. 1499 * rather not need to do the map translation overhead.
1391 * 3) We need to do some extra checking to make sure that we will 1500 * 3) We need to do some extra checking to make sure that we will
1392 * otherwise send the image as this layer, eg, either it matches 1501 * otherwise send the image as this layer, eg, either it matches
1393 * the head value, or is not multipart. 1502 * the head value, or is not multipart.
1394 */ 1503 */
1395 if (head && !head->more) { 1504 if (head && !head->more)
1505 {
1396 for (i=0; i<MAP_LAYERS; i++) { 1506 for (i = 0; i < MAP_LAYERS; i++)
1507 {
1397 ob = GET_MAP_FACE_OBJ(mp, mx, my, i); 1508 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1398 if (!ob) continue; 1509 if (!ob)
1510 continue;
1399 1511
1400 if (ob->head) ob=ob->head; 1512 if (ob->head)
1513 ob = ob->head;
1401 1514
1402 if (ob == head) { 1515 if (ob == head)
1516 {
1403 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL; 1517 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1404 head = NULL; 1518 head = NULL;
1405 break; 1519 break;
1520 }
1521 }
1406 } 1522 }
1407 }
1408 }
1409 1523
1410 ob = head; 1524 ob = head;
1525 if (!ob)
1411 if (!ob) ob = GET_MAP_FACE_OBJ(mp, mx, my, layer); 1526 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1412 1527
1413 /* If there is no object for this space, or if the face for the object 1528 /* If there is no object for this space, or if the face for the object
1414 * is the blank face, set the face number to zero. 1529 * is the blank face, set the face number to zero.
1415 * else if we have the stored head object for this space, that takes 1530 * else if we have the stored head object for this space, that takes
1416 * precedence over the other object for this space. 1531 * precedence over the other object for this space.
1417 * otherwise, we do special head processing 1532 * otherwise, we do special head processing
1418 */ 1533 */
1419 if (!ob || ob->face == blank_face) face_num=0; 1534 if (!ob || ob->face == blank_face)
1535 face_num = 0;
1420 else if (head){ 1536 else if (head)
1537 {
1421 /* if this is a head that had previously been stored */ 1538 /* if this is a head that had previously been stored */
1422 face_num = ob->face->number; 1539 face_num = ob->face->number;
1423 } else { 1540 }
1541 else
1542 {
1424 /* if the faces for the different parts of a multipart object 1543 /* if the faces for the different parts of a multipart object
1425 * are the same, we only want to send the bottom right most 1544 * are the same, we only want to send the bottom right most
1426 * portion of the object. That info is in the tail_.. values 1545 * portion of the object. That info is in the tail_.. values
1427 * of the head. Note that for the head itself, ob->head will 1546 * of the head. Note that for the head itself, ob->head will
1428 * be null, so we only do this block if we are working on 1547 * be null, so we only do this block if we are working on
1429 * a tail piece. 1548 * a tail piece.
1430 */ 1549 */
1431 1550
1432 /* tail_x and tail_y will only be set in the head object. If 1551 /* tail_x and tail_y will only be set in the head object. If
1433 * this is the head object and these are set, we proceed 1552 * this is the head object and these are set, we proceed
1434 * with logic to only send bottom right. Similarly, if 1553 * with logic to only send bottom right. Similarly, if
1435 * this is one of the more parts but the head has those values 1554 * this is one of the more parts but the head has those values
1436 * set, we want to do the processing. There can be cases where 1555 * set, we want to do the processing. There can be cases where
1437 * the head is not visible but one of its parts is, so we just 1556 * the head is not visible but one of its parts is, so we just
1438 * can always expect that ob->arch->tail_x will be true for all 1557 * can always expect that ob->arch->tail_x will be true for all
1439 * object we may want to display. 1558 * object we may want to display.
1440 */ 1559 */
1441 if ((ob->arch->tail_x || ob->arch->tail_y) || 1560 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1442 (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y))) { 1561 {
1443 1562
1444 if (ob->head) head = ob->head; 1563 if (ob->head)
1445 else head = ob; 1564 head = ob->head;
1565 else
1566 head = ob;
1446 1567
1447 /* Basically figure out where the offset is from where we are right 1568 /* Basically figure out where the offset is from where we are right
1448 * now. the ob->arch->clone.{x,y} values hold the offset that this current 1569 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1449 * piece is from the head, and the tail is where the tail is from the 1570 * piece is from the head, and the tail is where the tail is from the
1450 * head. Note that bx and by will equal sx and sy if we are already working 1571 * head. Note that bx and by will equal sx and sy if we are already working
1451 * on the bottom right corner. If ob is the head, the clone values 1572 * on the bottom right corner. If ob is the head, the clone values
1452 * will be zero, so the right thing will still happen. 1573 * will be zero, so the right thing will still happen.
1453 */ 1574 */
1454 bx = sx + head->arch->tail_x - ob->arch->clone.x; 1575 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1455 by = sy + head->arch->tail_y - ob->arch->clone.y; 1576 by = sy + head->arch->tail_y - ob->arch->clone.y;
1456 1577
1457 /* I don't think this can ever happen, but better to check for it just 1578 /* I don't think this can ever happen, but better to check for it just
1458 * in case. 1579 * in case.
1459 */ 1580 */
1460 if (bx < sx || by < sy) { 1581 if (bx < sx || by < sy)
1582 {
1461 LOG(llevError,"update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", 1583 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1462 bx, by, sx, sy); 1584 face_num = 0;
1463 face_num = 0; 1585 }
1464 }
1465 /* single part object, multipart object with non merged faces, 1586 /* single part object, multipart object with non merged faces,
1466 * of multipart object already at lower right. 1587 * of multipart object already at lower right.
1467 */ 1588 */
1468 else if (bx == sx && by == sy) { 1589 else if (bx == sx && by == sy)
1590 {
1469 face_num = ob->face->number; 1591 face_num = ob->face->number;
1470 1592
1471 /* if this face matches one stored away, clear that one away. 1593 /* if this face matches one stored away, clear that one away.
1472 * this code relies on the fact that the map1 commands 1594 * this code relies on the fact that the map1 commands
1473 * goes from 2 down to 0. 1595 * goes from 2 down to 0.
1474 */ 1596 */
1475 for (i=0; i<MAP_LAYERS; i++) 1597 for (i = 0; i < MAP_LAYERS; i++)
1476 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] && 1598 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1477 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num) 1599 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1478 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL; 1600 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1479 } 1601 }
1480 else { 1602 else
1603 {
1481 /* If this head is stored away, clear it - otherwise, 1604 /* If this head is stored away, clear it - otherwise,
1482 * there can be cases where a object is on multiple layers - 1605 * there can be cases where a object is on multiple layers -
1483 * we only want to send it once. 1606 * we only want to send it once.
1484 */ 1607 */
1485 face_num = head->face->number; 1608 face_num = head->face->number;
1486 for (i=0; i<MAP_LAYERS; i++) 1609 for (i = 0; i < MAP_LAYERS; i++)
1487 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] && 1610 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1488 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num) 1611 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1489 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL; 1612 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1490 1613
1491 /* First, try to put the new head on the same layer. If that is used up, 1614 /* First, try to put the new head on the same layer. If that is used up,
1492 * then find another layer. 1615 * then find another layer.
1493 */ 1616 */
1494 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL) { 1617 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1618 {
1495 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head; 1619 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1496 } else for (i=0; i<MAX_LAYERS; i++) { 1620 }
1621 else
1622 for (i = 0; i < MAX_LAYERS; i++)
1623 {
1497 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL || 1624 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1498 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head) { 1625 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1626 {
1499 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head; 1627 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1500 } 1628 }
1501 } 1629 }
1502 face_num = 0; /* Don't send this object - we'll send the head later */ 1630 face_num = 0; /* Don't send this object - we'll send the head later */
1503 } 1631 }
1504 } else { 1632 }
1633 else
1634 {
1505 /* In this case, we are already at the lower right or single part object, 1635 /* In this case, we are already at the lower right or single part object,
1506 * so nothing special 1636 * so nothing special
1507 */ 1637 */
1508 face_num = ob->face->number; 1638 face_num = ob->face->number;
1509 1639
1510 /* clear out any head entries that have the same face as this one */ 1640 /* clear out any head entries that have the same face as this one */
1511 for (bx=0; bx<layer; bx++) 1641 for (bx = 0; bx < layer; bx++)
1512 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] && 1642 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1513 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num) 1643 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1514 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL; 1644 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1515 } 1645 }
1516 } /* else not already head object or blank face */ 1646 } /* else not already head object or blank face */
1517 1647
1518 /* This is a real hack. Basically, if we have nothing to send for this layer, 1648 /* This is a real hack. Basically, if we have nothing to send for this layer,
1519 * but there is a head on the next layer, send that instead. 1649 * but there is a head on the next layer, send that instead.
1520 * Without this, what happens is you can get the case where the player stands 1650 * Without this, what happens is you can get the case where the player stands
1521 * on the same space as the head. However, if you have overlapping big objects 1651 * on the same space as the head. However, if you have overlapping big objects
1522 * of the same type, what happens then is it doesn't think it needs to send 1652 * of the same type, what happens then is it doesn't think it needs to send
1523 * This tends to make stacking also work/look better. 1653 * This tends to make stacking also work/look better.
1524 */ 1654 */
1525 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer -1]) { 1655 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1656 {
1526 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer -1]->face->number; 1657 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1527 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer -1] = NULL; 1658 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1528 } 1659 }
1529 1660
1530 /* Another hack - because of heads and whatnot, this face may match one 1661 /* Another hack - because of heads and whatnot, this face may match one
1531 * we already sent for a lower layer. In that case, don't send 1662 * we already sent for a lower layer. In that case, don't send
1532 * this one. 1663 * this one.
1533 */ 1664 */
1534 if (face_num && layer+1<MAP_LAYERS && ns->lastmap.cells[sx][sy].faces[layer+1] == face_num) { 1665 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1535 face_num = 0; 1666 face_num = 0;
1536 }
1537 1667
1538 /* We've gotten what face we want to use for the object. Now see if 1668 /* We've gotten what face we want to use for the object. Now see if
1539 * if it has changed since we last sent it to the client. 1669 * if it has changed since we last sent it to the client.
1540 */ 1670 */
1541 if (ns->lastmap.cells[sx][sy].faces[layer] != face_num) { 1671 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
1672 {
1542 ns->lastmap.cells[sx][sy].faces[layer] = face_num; 1673 ns.lastmap.cells[sx][sy].faces[layer] = face_num;
1543 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1674 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1544 esrv_send_face(ns, face_num, 0); 1675 esrv_send_face (&ns, face_num, 0);
1545 SockList_AddShort(sl, face_num); 1676
1546 return 1; 1677 sl << uint16 (face_num);
1678 return 1;
1547 } 1679 }
1680
1548 /* Nothing changed */ 1681 /* Nothing changed */
1549 return 0; 1682 return 0;
1550} 1683}
1551 1684
1552/** 1685/**
1553 * This function is mainly a copy of update_space, 1686 * This function is mainly a copy of update_space,
1554 * except it handles update of the smoothing updates, 1687 * except it handles update of the smoothing updates,
… …
1566 * layer is the layer to update, with 2 being the floor and 0 the 1699 * layer is the layer to update, with 2 being the floor and 0 the
1567 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1700 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1568 * take. 1701 * take.
1569 */ 1702 */
1570 1703
1571static inline int update_smooth(SockList *sl, NewSocket *ns, mapstruct *mp, int mx, int my, int sx, int sy, int layer) 1704static inline int
1705update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1572{ 1706{
1573 object *ob; 1707 object *ob;
1574 int smoothlevel; /* old face_num;*/ 1708 int smoothlevel; /* old face_num; */
1575 1709
1576 ob = GET_MAP_FACE_OBJ(mp, mx, my, layer); 1710 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1577 1711
1578 /* If there is no object for this space, or if the face for the object 1712 /* If there is no object for this space, or if the face for the object
1579 * is the blank face, set the smoothlevel to zero. 1713 * is the blank face, set the smoothlevel to zero.
1580 */ 1714 */
1581 if (!ob || ob->face == blank_face || MAP_NOSMOOTH(mp)) smoothlevel=0; 1715 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1716 smoothlevel = 0;
1582 else { 1717 else
1718 {
1583 smoothlevel = ob->smoothlevel; 1719 smoothlevel = ob->smoothlevel;
1584 if (smoothlevel && !(ns->faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1720 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1585 SendSmooth(ns, ob->face->number); 1721 SendSmooth (&ns, ob->face->number);
1586 } /* else not already head object or blank face */ 1722 } /* else not already head object or blank face */
1587 1723
1588 /* We've gotten what face we want to use for the object. Now see if 1724 /* We've gotten what face we want to use for the object. Now see if
1589 * if it has changed since we last sent it to the client. 1725 * if it has changed since we last sent it to the client.
1590 */ 1726 */
1591 if (smoothlevel>255) 1727 if (smoothlevel > 255)
1592 smoothlevel=255; 1728 smoothlevel = 255;
1593 else if (smoothlevel<0) 1729 else if (smoothlevel < 0)
1594 smoothlevel=0; 1730 smoothlevel = 0;
1731
1595 if (ns->lastmap.cells[sx][sy].smooth[layer] != smoothlevel) { 1732 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1733 {
1596 ns->lastmap.cells[sx][sy].smooth[layer] = smoothlevel; 1734 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1597 SockList_AddChar(sl, (uint8) (smoothlevel&0xFF)); 1735 sl << uint8 (smoothlevel);
1598 return 1; 1736 return 1;
1599 } 1737 }
1738
1600 /* Nothing changed */ 1739 /* Nothing changed */
1601 return 0; 1740 return 0;
1602} 1741}
1603 1742
1604/** 1743/**
1605 * Returns the size of a data for a map square as returned by 1744 * Returns the size of a data for a map square as returned by
1606 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1745 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1607 * available. 1746 * available.
1608 */ 1747 */
1748int
1609int getExtendedMapInfoSize(NewSocket* ns){ 1749getExtendedMapInfoSize (client * ns)
1750{
1610 int result=0; 1751 int result = 0;
1752
1611 if (ns->ext_mapinfos){ 1753 if (ns->ext_mapinfos)
1754 {
1612 if (ns->EMI_smooth) 1755 if (ns->EMI_smooth)
1613 result+=1; /*One byte for smoothlevel*/ 1756 result += 1; /*One byte for smoothlevel */
1614 } 1757 }
1615 return result; 1758 return result;
1616} 1759}
1760
1617/** 1761/**
1618 * This function uses the new map1 protocol command to send the map 1762 * This function uses the new map1 protocol command to send the map
1619 * to the client. It is necessary because the old map command supports 1763 * to the client. It is necessary because the old map command supports
1620 * a maximum map size of 15x15. 1764 * a maximum map size of 15x15.
1621 * This function is much simpler than the old one. This is because 1765 * This function is much simpler than the old one. This is because
… …
1634 * we use the count value to hold the darkness value. If -1, then this space 1778 * we use the count value to hold the darkness value. If -1, then this space
1635 * is not viewable. 1779 * is not viewable.
1636 * we use faces[0] faces[1] faces[2] to hold what the three layers 1780 * we use faces[0] faces[1] faces[2] to hold what the three layers
1637 * look like. 1781 * look like.
1638 */ 1782 */
1783void
1639void draw_client_map1(object *pl) 1784draw_client_map1 (object *pl)
1640{ 1785{
1641 int x,y,ax, ay, d, startlen, max_x, max_y, oldlen; 1786 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;
1642 sint16 nx, ny; 1787 sint16 nx, ny;
1643 int estartlen, eoldlen; 1788 int estartlen, eoldlen;
1644 SockList sl;
1645 SockList esl; /*For extended Map info*/
1646 uint16 mask,emask; 1789 uint16 mask, emask;
1647 uint8 eentrysize; 1790 uint8 eentrysize;
1648 uint16 ewhatstart,ewhatflag; 1791 uint16 ewhatstart, ewhatflag;
1649 uint8 extendedinfos; 1792 uint8 extendedinfos;
1650 mapstruct *m; 1793 maptile *m;
1794
1651 NewSocket &socket = pl->contr->socket; 1795 client &socket = *pl->contr->socket;
1652 1796
1653 check_map_change (pl->contr); 1797 check_map_change (pl->contr);
1654 1798
1655 sl.buf=(unsigned char*)malloc(MAXSOCKBUF); 1799 packet sl;
1656 if (socket.mapmode == Map1Cmd) 1800 packet esl;
1657 strcpy((char*)sl.buf,"map1 "); 1801
1658 else 1802 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1659 strcpy((char*)sl.buf,"map1a ");
1660 sl.len=strlen((char*)sl.buf);
1661 startlen = sl.len; 1803 startlen = sl.length ();
1804
1662 /*Extendedmapinfo structure initialisation*/ 1805 /*Extendedmapinfo structure initialisation */
1663 if (socket.ext_mapinfos){ 1806 if (socket.ext_mapinfos)
1664 esl.buf=(unsigned char*)malloc(MAXSOCKBUF); 1807 {
1665 strcpy((char*)esl.buf,"mapextended ");
1666 esl.len=strlen((char*)esl.buf);
1667 extendedinfos=EMI_NOREDRAW; 1808 extendedinfos = EMI_NOREDRAW;
1809
1668 if (socket.EMI_smooth) 1810 if (socket.EMI_smooth)
1669 extendedinfos|=EMI_SMOOTH; 1811 extendedinfos |= EMI_SMOOTH;
1812
1670 ewhatstart=esl.len; 1813 ewhatstart = esl.length ();
1671 ewhatflag=extendedinfos; /*The EMI_NOREDRAW bit 1814 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1672 could need to be taken away*/ 1815 could need to be taken away */
1673 SockList_AddChar(&esl, extendedinfos);
1674 eentrysize=getExtendedMapInfoSize(&socket); 1816 eentrysize = getExtendedMapInfoSize (&socket);
1675 SockList_AddChar(&esl, eentrysize); 1817 esl << "mapextended "
1818 << uint8 (extendedinfos)
1819 << uint8 (eentrysize);
1820
1676 estartlen = esl.len; 1821 estartlen = esl.length ();
1677 } else { 1822 }
1823 else
1824 {
1678 /* suppress compiler warnings */ 1825 /* suppress compiler warnings */
1679 ewhatstart = 0; 1826 ewhatstart = 0;
1680 ewhatflag = 0; 1827 ewhatflag = 0;
1681 estartlen = 0; 1828 estartlen = 0;
1682 } 1829 }
1830
1683 /* Init data to zero */ 1831 /* Init data to zero */
1684 memset(heads, 0, sizeof(object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS); 1832 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1685 1833
1686 /* x,y are the real map locations. ax, ay are viewport relative 1834 /* x,y are the real map locations. ax, ay are viewport relative
1687 * locations. 1835 * locations.
1688 */ 1836 */
1689 ay=0; 1837 ay = 0;
1690 1838
1691 /* We could do this logic as conditionals in the if statement, 1839 /* We could do this logic as conditionals in the if statement,
1692 * but that started to get a bit messy to look at. 1840 * but that started to get a bit messy to look at.
1693 */ 1841 */
1694 max_x = pl->x+(socket.mapx+1)/2; 1842 max_x = pl->x + (socket.mapx + 1) / 2;
1695 max_y = pl->y+(socket.mapy+1)/2; 1843 max_y = pl->y + (socket.mapy + 1) / 2;
1844
1696 if (socket.mapmode == Map1aCmd) { 1845 if (socket.mapmode == Map1aCmd)
1846 {
1697 max_x += MAX_HEAD_OFFSET; 1847 max_x += MAX_HEAD_OFFSET;
1698 max_y += MAX_HEAD_OFFSET; 1848 max_y += MAX_HEAD_OFFSET;
1699 } 1849 }
1700 1850
1701 for(y=pl->y-socket.mapy/2; y<max_y; y++,ay++) { 1851 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1702 ax=0; 1852 {
1853 ax = 0;
1703 for(x=pl->x-socket.mapx/2;x<max_x;x++,ax++) { 1854 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1855 {
1704 1856
1705 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1857 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1706 1858
1707 /* If this space is out of the normal viewable area, we only check 1859 /* If this space is out of the normal viewable area, we only check
1708 * the heads value ax or ay will only be greater than what 1860 * the heads value ax or ay will only be greater than what
1709 * the client wants if using the map1a command - this is because 1861 * the client wants if using the map1a command - this is because
1710 * if the map1a command is not used, max_x and max_y will be 1862 * if the map1a command is not used, max_x and max_y will be
1711 * set to lower values. 1863 * set to lower values.
1712 */ 1864 */
1713 if (ax >= socket.mapx || ay >= socket.mapy) { 1865 if (ax >= socket.mapx || ay >= socket.mapy)
1714 int i, got_one; 1866 {
1867 int i, got_one;
1715 1868
1716 oldlen = sl.len; 1869 oldlen = sl.length ();
1717 1870
1718 SockList_AddShort(&sl, mask); 1871 sl << uint16 (mask);
1719 1872
1720 if (check_head (sl, socket, ax, ay, 2)) 1873 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1721 mask |= 0x4; 1874 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1722 if (check_head (sl, socket, ax, ay, 1)) 1875 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1723 mask |= 0x2;
1724 if (check_head (sl, socket, ax, ay, 0))
1725 mask |= 0x1;
1726 1876
1727 /* If all we are doing is sending 0 (blank) faces, we don't 1877 /* If all we are doing is sending 0 (blank) faces, we don't
1728 * actually need to send that - just the coordinates 1878 * actually need to send that - just the coordinates
1729 * with no faces tells the client to blank out the 1879 * with no faces tells the client to blank out the
1730 * space. 1880 * space.
1731 */ 1881 */
1732 got_one=0; 1882 got_one = 0;
1733 for (i=oldlen+2; i<sl.len; i++) { 1883 for (i = oldlen + 2; i < sl.length (); i++)
1734 if (sl.buf[i]) got_one=1; 1884 if (sl[i])
1735 } 1885 got_one = 1;
1736 1886
1737 if (got_one && (mask & 0xf)) { 1887 if (got_one && (mask & 0xf))
1738 sl.buf[oldlen+1] = mask & 0xff; 1888 sl[oldlen + 1] = mask & 0xff;
1739 } else { /*either all faces blank, either no face at all*/ 1889 else
1890 { /*either all faces blank, either no face at all */
1740 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates*/ 1891 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1741 sl.len = oldlen + 2; 1892 sl.reset (oldlen + 2);
1742 else 1893 else
1743 sl.len = oldlen; 1894 sl.reset (oldlen);
1744 } 1895 }
1896
1745 /*What concerns extendinfos, nothing to be done for now 1897 /*What concerns extendinfos, nothing to be done for now
1746 * (perhaps effects layer later) 1898 * (perhaps effects layer later)
1747 */ 1899 */
1748 continue; /* don't do processing below */ 1900 continue; /* don't do processing below */
1749 } 1901 }
1750 1902
1751 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1903 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1752 1904
1753 d = pl->contr->blocked_los[ax][ay]; 1905 d = pl->contr->blocked_los[ax][ay];
1754 1906
1755 /* If the coordinates are not valid, or it is too dark to see, 1907 /* If the coordinates are not valid, or it is too dark to see,
1756 * we tell the client as such 1908 * we tell the client as such
1757 */ 1909 */
1758 nx=x; 1910 nx = x;
1759 ny=y; 1911 ny = y;
1760 m = get_map_from_coord(pl->map, &nx, &ny); 1912 m = get_map_from_coord (pl->map, &nx, &ny);
1761 if (!m) { 1913
1914 if (!m)
1915 {
1762 /* space is out of map. Update space and clear values 1916 /* space is out of map. Update space and clear values
1763 * if this hasn't already been done. If the space is out 1917 * if this hasn't already been done. If the space is out
1764 * of the map, it shouldn't have a head 1918 * of the map, it shouldn't have a head
1765 */ 1919 */
1766 if (lastcell.count != -1) { 1920 if (lastcell.count != -1)
1767 SockList_AddShort(&sl, mask); 1921 {
1922 sl << uint16 (mask);
1768 map_clearcell(&lastcell,0,0,0,-1); 1923 map_clearcell (&lastcell, 0, 0, 0, -1);
1769 } 1924 }
1770 } else if (d>3) { 1925 }
1771 int need_send=0, count; 1926 else if (d > 3)
1927 {
1928 int need_send = 0, count;
1929
1772 /* This block deals with spaces that are not visible for whatever 1930 /* This block deals with spaces that are not visible for whatever
1773 * reason. Still may need to send the head for this space. 1931 * reason. Still may need to send the head for this space.
1774 */ 1932 */
1775 1933
1776 oldlen = sl.len; 1934 oldlen = sl.length ();
1777 1935
1778 SockList_AddShort(&sl, mask); 1936 sl << uint16 (mask);
1937
1779 if (lastcell.count != -1) need_send=1; 1938 if (lastcell.count != -1)
1939 need_send = 1;
1940
1780 count = -1; 1941 count = -1;
1781 1942
1782 if (socket.mapmode == Map1aCmd && have_head(ax, ay)) { 1943 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1944 {
1783 /* Now check to see if any heads need to be sent */ 1945 /* Now check to see if any heads need to be sent */
1784 1946
1785 if (check_head (sl, socket, ax, ay, 2)) 1947 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1786 mask |= 0x4; 1948 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1787 if (check_head (sl, socket, ax, ay, 1)) 1949 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1788 mask |= 0x2;
1789 if (check_head (sl, socket, ax, ay, 0))
1790 mask |= 0x1;
1791 1950
1792 lastcell.count = count; 1951 lastcell.count = count;
1793 1952 }
1794 } else { 1953 else
1795 struct MapCell *cell = &lastcell; 1954 {
1796 /* properly clear a previously sent big face */ 1955 /* properly clear a previously sent big face */
1797 if(cell->faces[0] != 0 1956 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0
1798 || cell->faces[1] != 0 1957 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1799 || cell->faces[2] != 0) 1958 need_send = 1;
1800 need_send = 1; 1959
1801 map_clearcell(&lastcell, 0, 0, 0, count); 1960 map_clearcell (&lastcell, 0, 0, 0, count);
1802 } 1961 }
1803 1962
1804 if ((mask & 0xf) || need_send) { 1963 if ((mask & 0xf) || need_send)
1805 sl.buf[oldlen+1] = mask & 0xff; 1964 sl[oldlen + 1] = mask & 0xff;
1806 } else { 1965 else
1807 sl.len = oldlen; 1966 sl.reset (oldlen);
1808 } 1967 }
1809 } else { 1968 else
1969 {
1810 /* In this block, the space is visible or there are head objects 1970 /* In this block, the space is visible or there are head objects
1811 * we need to send. 1971 * we need to send.
1812 */ 1972 */
1813 1973
1814 /* Rather than try to figure out what everything that we might 1974 /* Rather than try to figure out what everything that we might
1815 * need to send is, then form the packet after that, 1975 * need to send is, then form the packet after that,
1816 * we presume that we will in fact form a packet, and update 1976 * we presume that we will in fact form a packet, and update
1817 * the bits by what we do actually send. If we send nothing, 1977 * the bits by what we do actually send. If we send nothing,
1818 * we just back out sl.len to the old value, and no harm 1978 * we just back out sl.length () to the old value, and no harm
1819 * is done. 1979 * is done.
1820 * I think this is simpler than doing a bunch of checks to see 1980 * I think this is simpler than doing a bunch of checks to see
1821 * what if anything we need to send, setting the bits, then 1981 * what if anything we need to send, setting the bits, then
1822 * doing those checks again to add the real data. 1982 * doing those checks again to add the real data.
1823 */ 1983 */
1824 oldlen = sl.len; 1984 oldlen = sl.length ();
1825 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1985 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1826 eoldlen = esl.len; 1986 eoldlen = esl.length ();
1827 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1987 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1828 SockList_AddShort(&sl, mask); 1988 sl << uint16 (mask);
1829 1989
1830 if (socket.ext_mapinfos) 1990 if (socket.ext_mapinfos)
1831 SockList_AddShort(&esl, emask); 1991 esl << uint16 (emask);
1832 1992
1833 unsigned char dummy; 1993 unsigned char dummy;
1834 unsigned char *last_ext = &dummy; 1994 unsigned char *last_ext = &dummy;
1835 1995
1836 /* Darkness changed */ 1996 /* Darkness changed */
1837 if (lastcell.count != d && socket.darkness) { 1997 if (lastcell.count != d && socket.darkness)
1838 mask |= 0x8; 1998 {
1999 mask |= 0x8;
1839 2000
1840 if (socket.extmap) 2001 if (socket.extmap)
1841 { 2002 {
1842 *last_ext |= 0x80; last_ext = sl.buf + sl.len; SockList_AddChar (&sl, d); 2003 *last_ext |= 0x80;
2004 last_ext = &sl[sl.length ()];
2005 sl << uint8 (d);
1843 } 2006 }
1844 else 2007 else
1845 SockList_AddChar (&sl, 255 - 64 * d); 2008 sl << uint8 (255 - 64 * d);
1846 } 2009 }
1847 2010
1848 lastcell.count = d; 2011 lastcell.count = d;
1849 2012
1850 if (socket.extmap) 2013 if (socket.extmap)
1851 { 2014 {
1852 uint8 stat_hp = 0; 2015 uint8 stat_hp = 0;
1853 uint8 stat_width = 0; 2016 uint8 stat_width = 0;
2017 uint8 flags = 0;
1854 tag_t player = 0; 2018 UUID player = 0;
1855 2019
1856 // send hp information, if applicable 2020 // send hp information, if applicable
1857 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 2021 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))
1858 { 2022 {
1859 if (op->head || op->invisible) 2023 if (op->head || op->invisible)
1860 continue; 2024 ; // do not show
1861
1862 if (op->type == PLAYER 2025 else if (op->type == PLAYER
1863 || QUERY_FLAG(op, FLAG_MONSTER) 2026 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1864 || QUERY_FLAG(op, FLAG_ALIVE)
1865 || QUERY_FLAG(op, FLAG_GENERATOR))
1866 { 2027 {
1867 if (op->stats.maxhp > 0 2028 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1868 && (unsigned)op->stats.maxhp > (unsigned)op->stats.hp)
1869 { 2029 {
1870 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 2030 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1871 stat_width = op->arch->tail_x; 2031 stat_width = op->arch->tail_x;
1872 } 2032 }
1873 } 2033 }
1874 2034
2035 if (op->msg && op->msg[0] == '@')
2036 flags |= 1;
2037
1875 if (op->type == PLAYER && op != pl) 2038 if (op->type == PLAYER && op != pl)
1876 player = op->count; 2039 player = op->count;
1877 } 2040 }
1878 2041
1879 if (lastcell.stat_hp != stat_hp) 2042 if (lastcell.stat_hp != stat_hp)
1880 { 2043 {
1881 lastcell.stat_hp = stat_hp; 2044 lastcell.stat_hp = stat_hp;
1882 2045
1883 mask |= 0x8; 2046 mask |= 0x8;
1884 *last_ext |= 0x80; last_ext = sl.buf + sl.len; SockList_AddChar (&sl, 5); 2047 *last_ext |= 0x80;
1885 SockList_AddChar (&sl, stat_hp); 2048 last_ext = &sl[sl.length ()];
1886 2049
2050 sl << uint8 (5) << uint8 (stat_hp);
2051
1887 if (stat_width > 1) 2052 if (stat_width > 1)
1888 { 2053 {
1889 *last_ext |= 0x80; last_ext = sl.buf + sl.len; SockList_AddChar (&sl, 6); 2054 *last_ext |= 0x80;
1890 SockList_AddChar (&sl, stat_width); 2055 last_ext = &sl[sl.length ()];
2056
2057 sl << uint8 (6) << uint8 (stat_width);
1891 } 2058 }
1892 } 2059 }
1893 2060
1894 if (lastcell.player != player) 2061 if (lastcell.player != player)
1895 { 2062 {
1896 lastcell.player = player; 2063 lastcell.player = player;
2064
1897 mask |= 0x8; 2065 mask |= 0x8;
1898 *last_ext |= 0x80; last_ext = sl.buf + sl.len; SockList_AddChar (&sl, 0x47); 2066 *last_ext |= 0x80;
1899 SockList_AddChar (&sl, 4); 2067 last_ext = &sl[sl.length ()];
1900 SockList_AddInt (&sl, player); 2068
2069 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
1901 } 2070 }
2071
2072 if (lastcell.flags != flags)
2073 {
2074 lastcell.flags = flags;
2075
2076 mask |= 0x8;
2077 *last_ext |= 0x80;
2078 last_ext = &sl[sl.length ()];
2079
2080 sl << uint8 (8) << uint8 (flags);
1902 } 2081 }
2082 }
1903 2083
1904 /* Floor face */ 2084 /* Floor face */
1905 if (update_space(&sl, &socket, m, nx, ny, ax, ay, 2)) 2085 if (update_space (sl, socket, m, nx, ny, ax, ay, 2))
1906 mask |= 0x4; 2086 mask |= 0x4;
1907 2087
1908 if (socket.EMI_smooth) 2088 if (socket.EMI_smooth)
1909 if (update_smooth(&esl, &socket, m, nx, ny, ax, ay, 2)) 2089 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1910 emask |= 0x4; 2090 emask |= 0x4;
1911 2091
1912 /* Middle face */ 2092 /* Middle face */
1913 if (update_space(&sl, &socket, m, nx, ny, ax, ay, 1)) 2093 if (update_space (sl, socket, m, nx, ny, ax, ay, 1))
1914 mask |= 0x2; 2094 mask |= 0x2;
1915 2095
1916 if (socket.EMI_smooth) 2096 if (socket.EMI_smooth)
1917 if (update_smooth(&esl, &socket, m, nx, ny, ax, ay, 1)) 2097 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
1918 emask |= 0x2; 2098 emask |= 0x2;
1919 2099
1920 if(nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) { 2100 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
2101 {
1921 if (lastcell.faces[0] != pl->face->number) { 2102 if (lastcell.faces[0] != pl->face->number)
1922 lastcell.faces[0] = pl->face->number; 2103 {
1923 mask |= 0x1; 2104 lastcell.faces[0] = pl->face->number;
2105 mask |= 0x1;
2106
1924 if (!(socket.faces_sent[pl->face->number] &NS_FACESENT_FACE)) 2107 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
1925 esrv_send_face(&socket, pl->face->number, 0); 2108 esrv_send_face (&socket, pl->face->number, 0);
1926 SockList_AddShort(&sl, pl->face->number); 2109
1927 } 2110 sl << uint16 (pl->face->number);
1928 } 2111 }
1929 /* Top face */ 2112 }
1930 else { 2113 else
2114 {
2115 /* Top face */
1931 if (update_space(&sl, &socket, m, nx, ny, ax, ay, 0)) 2116 if (update_space (sl, socket, m, nx, ny, ax, ay, 0))
1932 mask |= 0x1; 2117 mask |= 0x1;
2118
1933 if (socket.EMI_smooth) 2119 if (socket.EMI_smooth)
1934 if (update_smooth(&esl, &socket, m, nx, ny, ax, ay, 0)){ 2120 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1935 emask |= 0x1; 2121 emask |= 0x1;
1936 } 2122 }
1937 } 2123
1938 /* Check to see if we are in fact sending anything for this 2124 /* Check to see if we are in fact sending anything for this
1939 * space by checking the mask. If so, update the mask. 2125 * space by checking the mask. If so, update the mask.
1940 * if not, reset the len to that from before adding the mask 2126 * if not, reset the len to that from before adding the mask
1941 * value, so we don't send those bits. 2127 * value, so we don't send those bits.
1942 */ 2128 */
1943 if (mask & 0xf) { 2129 if (mask & 0xf)
1944 sl.buf[oldlen+1] = mask & 0xff; 2130 sl[oldlen + 1] = mask & 0xff;
1945 } else { 2131 else
1946 sl.len = oldlen; 2132 sl.reset (oldlen);
1947 } 2133
1948 if (emask & 0xf) { 2134 if (emask & 0xf)
1949 esl.buf[eoldlen+1] = emask & 0xff; 2135 esl[eoldlen + 1] = emask & 0xff;
1950 } else { 2136 else
1951 esl.len = eoldlen; 2137 esl.reset (eoldlen);
1952 }
1953 } /* else this is a viewable space */ 2138 } /* else this is a viewable space */
1954 } /* for x loop */ 2139 } /* for x loop */
1955 } /* for y loop */ 2140 } /* for y loop */
1956 2141
1957 /* Verify that we in fact do need to send this */ 2142 /* Verify that we in fact do need to send this */
1958 if (socket.ext_mapinfos){ 2143 if (socket.ext_mapinfos)
2144 {
1959 if (!(sl.len>startlen || socket.sent_scroll)){ 2145 if (!(sl.length () > startlen || socket.sent_scroll))
2146 {
1960 /* No map data will follow, so don't say the client 2147 /* No map data will follow, so don't say the client
1961 * it doesn't need draw! 2148 * it doesn't need draw!
1962 */ 2149 */
1963 ewhatflag&=(~EMI_NOREDRAW); 2150 ewhatflag &= (~EMI_NOREDRAW);
1964 esl.buf[ewhatstart+1] = ewhatflag & 0xff; 2151 esl[ewhatstart + 1] = ewhatflag & 0xff;
1965 } 2152 }
2153
1966 if (esl.len>estartlen) { 2154 if (esl.length () > estartlen)
1967 Send_With_Handling(&socket, &esl); 2155 socket.send_packet (esl);
1968 }
1969 free(esl.buf);
1970 } 2156 }
2157
1971 if (sl.len>startlen || socket.sent_scroll) { 2158 if (sl.length () > startlen || socket.sent_scroll)
1972 Send_With_Handling(&socket, &sl); 2159 {
2160 socket.send_packet (sl);
1973 socket.sent_scroll = 0; 2161 socket.sent_scroll = 0;
1974 } 2162 }
1975 free(sl.buf);
1976} 2163}
1977 2164
1978/** 2165/**
1979 * Draws client map. 2166 * Draws client map.
1980 */ 2167 */
2168void
1981void draw_client_map(object *pl) 2169draw_client_map (object *pl)
1982{ 2170{
1983 int i,j; 2171 int i, j;
1984 sint16 ax, ay, nx, ny;/* ax and ay goes from 0 to max-size of arrays */ 2172 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
1985 New_Face *face,*floor; 2173 New_Face *face, *floor;
1986 New_Face *floor2; 2174 New_Face *floor2;
1987 int d, mflags; 2175 int d, mflags;
1988 struct Map newmap; 2176 struct Map newmap;
1989 mapstruct *m, *pm; 2177 maptile *m, *pm;
1990 2178
1991 if (pl->type != PLAYER) { 2179 if (pl->type != PLAYER)
2180 {
1992 LOG(llevError,"draw_client_map called with non player/non eric-server\n"); 2181 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1993 return; 2182 return;
1994 } 2183 }
1995 2184
1996 if (pl->contr->transport) {
1997 pm = pl->contr->transport->map;
1998 }
1999 else
2000 pm = pl->map; 2185 pm = pl->map;
2001 2186
2002 /* If player is just joining the game, he isn't here yet, so the map 2187 /* If player is just joining the game, he isn't here yet, so the map
2003 * can get swapped out. If so, don't try to send them a map. All will 2188 * can get swapped out. If so, don't try to send them a map. All will
2004 * be OK once they really log in. 2189 * be OK once they really log in.
2005 */ 2190 */
2006 if (pm==NULL || pm->in_memory!=MAP_IN_MEMORY) return; 2191 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2192 return;
2007 2193
2008 memset(&newmap, 0, sizeof(struct Map)); 2194 memset (&newmap, 0, sizeof (struct Map));
2009 2195
2010 for(j = (pl->y - pl->contr->socket.mapy/2) ; j < (pl->y + (pl->contr->socket.mapy+1)/2); j++) { 2196 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)
2197 {
2011 for(i = (pl->x - pl->contr->socket.mapx/2) ; i < (pl->x + (pl->contr->socket.mapx+1)/2); i++) { 2198 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)
2012 ax=i; 2199 {
2013 ay=j; 2200 ax = i;
2201 ay = j;
2014 m = pm; 2202 m = pm;
2015 mflags = get_map_flags(m, &m, ax, ay, &ax, &ay); 2203 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2016 if (mflags & P_OUT_OF_MAP) 2204 if (mflags & P_OUT_OF_MAP)
2017 continue; 2205 continue;
2018 if (mflags & P_NEED_UPDATE) 2206 if (mflags & P_NEED_UPDATE)
2019 update_position(m, ax, ay); 2207 update_position (m, ax, ay);
2020 /* If a map is visible to the player, we don't want to swap it out 2208 /* If a map is visible to the player, we don't want to swap it out
2021 * just to reload it. This should really call something like 2209 * just to reload it. This should really call something like
2022 * swap_map, but this is much more efficient and 'good enough' 2210 * swap_map, but this is much more efficient and 'good enough'
2023 */ 2211 */
2024 if (mflags & P_NEW_MAP) 2212 if (mflags & P_NEW_MAP)
2025 m->timeout = 50; 2213 m->timeout = 50;
2026 } 2214 }
2027 } 2215 }
2028 /* do LOS after calls to update_position */ 2216 /* do LOS after calls to update_position */
2029 if(pl->contr->do_los) { 2217 if (pl->contr->do_los)
2218 {
2030 update_los(pl); 2219 update_los (pl);
2031 pl->contr->do_los = 0; 2220 pl->contr->do_los = 0;
2032 } 2221 }
2033 2222
2034 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd) {
2035 /* Big maps need a different drawing mechanism to work */ 2223 /* Big maps need a different drawing mechanism to work */
2036 draw_client_map1(pl); 2224 draw_client_map1 (pl);
2037 return;
2038 }
2039
2040 if(pl->invisible & (pl->invisible < 50 ? 4 : 1)) {
2041 esrv_map_setbelow(&pl->contr->socket,pl->contr->socket.mapx/2,
2042 pl->contr->socket.mapy/2,pl->face->number,&newmap);
2043 }
2044
2045 /* j and i are the y and x coordinates of the real map (which is
2046 * basically some number of spaces around the player)
2047 * ax and ay are values from within the viewport (ie, 0, 0 is upper
2048 * left corner) and are thus disconnected from the map values.
2049 * Subtract 1 from the max values so that we properly handle cases where
2050 * player has specified an even map. Otherwise, we try to send them too
2051 * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually
2052 * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is
2053 * odd, this still works fine.
2054 */
2055 ay=0;
2056 for(j=pl->y-pl->contr->socket.mapy/2; j<=pl->y+(pl->contr->socket.mapy-1)/2;j++, ay++) {
2057 ax=0;
2058 for(i=pl->x-pl->contr->socket.mapx/2;i<=pl->x+(pl->contr->socket.mapx-1)/2;i++, ax++) {
2059
2060 d = pl->contr->blocked_los[ax][ay];
2061 /* note the out_of_map and d>3 checks are both within the same
2062 * negation check.
2063 */
2064 nx = i;
2065 ny = j;
2066 m = get_map_from_coord(pm, &nx, &ny);
2067 if (m && d<4) {
2068 face = GET_MAP_FACE(m, nx, ny,0);
2069 floor2 = GET_MAP_FACE(m, nx, ny,1);
2070 floor = GET_MAP_FACE(m, nx, ny,2);
2071
2072 /* If all is blank, send a blank face. */
2073 if ((!face || face == blank_face) &&
2074 (!floor2 || floor2 == blank_face) &&
2075 (!floor || floor == blank_face)) {
2076 esrv_map_setbelow(&pl->contr->socket,ax,ay,
2077 blank_face->number,&newmap);
2078 } else { /* actually have something interesting */
2079 /* send the darkness mask, if any. */
2080 if (d && pl->contr->socket.darkness)
2081 esrv_map_setbelow(&pl->contr->socket,ax,ay,
2082 dark_faces[d-1]->number,&newmap);
2083
2084 if (face && face != blank_face)
2085 esrv_map_setbelow(&pl->contr->socket,ax,ay,
2086 face->number,&newmap);
2087 if (floor2 && floor2 != blank_face)
2088 esrv_map_setbelow(&pl->contr->socket,ax,ay,
2089 floor2->number,&newmap);
2090 if (floor && floor != blank_face)
2091 esrv_map_setbelow(&pl->contr->socket,ax,ay,
2092 floor->number,&newmap);
2093 }
2094 } /* Is a valid space */
2095 }
2096 }
2097 esrv_map_doneredraw(&pl->contr->socket, &newmap);
2098
2099 check_map_change (pl->contr);
2100} 2225}
2101 2226
2102 2227
2103/*****************************************************************************/ 2228/*****************************************************************************/
2229
2104/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 2230/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
2231
2105/* a player. Of course, the client need to know the command to be able to */ 2232/* a player. Of course, the client need to know the command to be able to */
2233
2106/* manage it ! */ 2234/* manage it ! */
2235
2107/*****************************************************************************/ 2236/*****************************************************************************/
2237void
2108void send_plugin_custom_message(object *pl, char *buf) 2238send_plugin_custom_message (object *pl, char *buf)
2109{ 2239{
2110 cs_write_string(&pl->contr->socket,buf,strlen(buf)); 2240 pl->contr->socket->send_packet (buf);
2111} 2241}
2112 2242
2113/** 2243/**
2114 * This sends the skill number to name mapping. We ignore 2244 * This sends the skill number to name mapping. We ignore
2115 * the params - we always send the same info no matter what. 2245 * the params - we always send the same info no matter what.
2116 */ 2246 */
2247void
2117void send_skill_info(NewSocket *ns, char *params) 2248send_skill_info (client *ns, char *params)
2118{ 2249{
2119 SockList sl; 2250 packet sl;
2120 int i; 2251 sl << "replyinfo skill_info\n";
2121 2252
2122 sl.buf = (unsigned char*) malloc(MAXSOCKBUF);
2123 strcpy((char*)sl.buf,"replyinfo skill_info\n");
2124 for (i=1; i< NUM_SKILLS; i++) { 2253 for (int i = 1; i < NUM_SKILLS; i++)
2125 sprintf((char*)sl.buf + strlen((char*)sl.buf), "%d:%s\n", i + CS_STAT_SKILLINFO, 2254 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2126 skill_names[i]); 2255
2127 }
2128 sl.len = strlen((char*)sl.buf);
2129 if (sl.len >= MAXSOCKBUF) { 2256 if (sl.length () >= MAXSOCKBUF)
2257 {
2130 LOG(llevError,"Buffer overflow in send_skill_info!\n"); 2258 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2131 fatal(0); 2259 fatal (0);
2132 } 2260 }
2133 Send_With_Handling(ns, &sl); 2261
2134 free(sl.buf); 2262 ns->send_packet (sl);
2135} 2263}
2136 2264
2137/** 2265/**
2138 * This sends the spell path to name mapping. We ignore 2266 * This sends the spell path to name mapping. We ignore
2139 * the params - we always send the same info no matter what. 2267 * the params - we always send the same info no matter what.
2140 */ 2268 */
2269void
2141void send_spell_paths (NewSocket *ns, char *params) { 2270send_spell_paths (client * ns, char *params)
2142 SockList sl; 2271{
2143 int i; 2272 packet sl;
2144 2273
2145 sl.buf = (unsigned char*) malloc(MAXSOCKBUF); 2274 sl << "replyinfo spell_paths\n";
2146 strcpy((char*)sl.buf,"replyinfo spell_paths\n"); 2275
2147 for(i=0; i<NRSPELLPATHS; i++) 2276 for (int i = 0; i < NRSPELLPATHS; i++)
2148 sprintf((char*)sl.buf + strlen((char*)sl.buf), "%d:%s\n", 1<<i, spellpathnames[i]); 2277 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2149 sl.len = strlen((char*)sl.buf); 2278
2150 if (sl.len >= MAXSOCKBUF) { 2279 if (sl.length () >= MAXSOCKBUF)
2280 {
2151 LOG(llevError,"Buffer overflow in send_spell_paths!\n"); 2281 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2152 fatal(0); 2282 fatal (0);
2153 } 2283 }
2154 Send_With_Handling(ns, &sl); 2284
2155 free(sl.buf); 2285 ns->send_packet (sl);
2156} 2286}
2157 2287
2158/** 2288/**
2159 * This looks for any spells the player may have that have changed their stats. 2289 * This looks for any spells the player may have that have changed their stats.
2160 * it then sends an updspell packet for each spell that has changed in this way 2290 * it then sends an updspell packet for each spell that has changed in this way
2161 */ 2291 */
2292void
2162void esrv_update_spells(player *pl) { 2293esrv_update_spells (player *pl)
2163 SockList sl; 2294{
2164 int flags=0;
2165 object *spell;
2166 if (!pl->socket.monitor_spells) return; 2295 if (!pl->socket->monitor_spells)
2296 return;
2297
2167 for (spell=pl->ob->inv; spell!=NULL; spell=spell->below) { 2298 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2299 {
2168 if (spell->type == SPELL) { 2300 if (spell->type == SPELL)
2301 {
2302 int flags = 0;
2303
2169 /* check if we need to update it*/ 2304 /* check if we need to update it */
2170 if (spell->last_sp != SP_level_spellpoint_cost(pl->ob, spell, SPELL_MANA)) { 2305 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
2306 {
2171 spell->last_sp = SP_level_spellpoint_cost(pl->ob, spell, SPELL_MANA); 2307 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2172 flags |= UPD_SP_MANA; 2308 flags |= UPD_SP_MANA;
2173 } 2309 }
2310
2174 if (spell->last_grace != SP_level_spellpoint_cost(pl->ob, spell, SPELL_GRACE)) { 2311 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
2312 {
2175 spell->last_grace = SP_level_spellpoint_cost(pl->ob, spell, SPELL_GRACE); 2313 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2176 flags |= UPD_SP_GRACE; 2314 flags |= UPD_SP_GRACE;
2177 } 2315 }
2316
2178 if (spell->last_eat != spell->stats.dam+SP_level_dam_adjust(pl->ob, spell)) { 2317 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
2318 {
2179 spell->last_eat = spell->stats.dam+SP_level_dam_adjust(pl->ob, spell); 2319 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2180 flags |= UPD_SP_DAMAGE; 2320 flags |= UPD_SP_DAMAGE;
2321 }
2322
2323 if (flags)
2324 {
2325 packet sl;
2326
2327 sl << "updspell "
2328 << uint8 (flags)
2329 << uint32 (spell->count);
2330
2331 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2332 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2333 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2334
2335 pl->socket->send_packet (sl);
2336 }
2337 }
2181 } 2338 }
2182 if (flags !=0) {
2183 sl.buf =(unsigned char*) malloc(MAXSOCKBUF);
2184 strcpy((char*)sl.buf,"updspell ");
2185 sl.len=strlen((char*)sl.buf);
2186 SockList_AddChar(&sl, flags);
2187 SockList_AddInt(&sl, spell->count);
2188 if (flags & UPD_SP_MANA) SockList_AddShort(&sl, spell->last_sp);
2189 if (flags & UPD_SP_GRACE) SockList_AddShort(&sl, spell->last_grace);
2190 if (flags & UPD_SP_DAMAGE) SockList_AddShort(&sl, spell->last_eat);
2191 flags = 0;
2192 Send_With_Handling(&pl->socket, &sl);
2193 free(sl.buf);
2194 }
2195 }
2196 }
2197} 2339}
2198 2340
2341void
2199void esrv_remove_spell(player *pl, object *spell) { 2342esrv_remove_spell (player *pl, object *spell)
2200 SockList sl; 2343{
2201
2202 if (!pl->socket.monitor_spells) return; 2344 if (!pl->socket->monitor_spells)
2345 return;
2346
2203 if (!pl || !spell || spell->env != pl->ob) { 2347 if (!pl || !spell || spell->env != pl->ob)
2348 {
2204 LOG(llevError, "Invalid call to esrv_remove_spell"); 2349 LOG (llevError, "Invalid call to esrv_remove_spell");
2205 return; 2350 return;
2206 } 2351 }
2207 sl.buf = (unsigned char*) malloc(MAXSOCKBUF); 2352
2208 strcpy((char*)sl.buf,"delspell "); 2353 packet sl;
2209 sl.len=strlen((char*)sl.buf); 2354
2210 SockList_AddInt(&sl, spell->count); 2355 sl << "delspell "
2211 Send_With_Handling(&pl->socket, &sl); 2356 << uint32 (spell->count);
2212 free(sl.buf); 2357
2358 pl->socket->send_packet (sl);
2213} 2359}
2214 2360
2215/* appends the spell *spell to the Socklist we will send the data to. */ 2361/* appends the spell *spell to the Socklist we will send the data to. */
2362static void
2216static void append_spell (player *pl, SockList *sl, object *spell) { 2363append_spell (player *pl, packet &sl, object *spell)
2364{
2217 int len, i, skill=0; 2365 int len, i, skill = 0;
2218 2366
2219 if (!(spell->name)) { 2367 if (!(spell->name))
2368 {
2220 LOG(llevError, "item number %d is a spell with no name.\n", spell->count); 2369 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2221 return; 2370 return;
2222 } 2371 }
2223 SockList_AddInt(sl, spell->count); 2372
2224 SockList_AddShort(sl, spell->level);
2225 SockList_AddShort(sl, spell->casting_time);
2226 /* store costs and damage in the object struct, to compare to later */ 2373 /* store costs and damage in the object struct, to compare to later */
2227 spell->last_sp = SP_level_spellpoint_cost(pl->ob, spell, SPELL_MANA); 2374 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2228 spell->last_grace = SP_level_spellpoint_cost(pl->ob, spell, SPELL_GRACE); 2375 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2229 spell->last_eat = spell->stats.dam+SP_level_dam_adjust(pl->ob, spell); 2376 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2230 /* send the current values */
2231 SockList_AddShort(sl, spell->last_sp);
2232 SockList_AddShort(sl, spell->last_grace);
2233 SockList_AddShort(sl, spell->last_eat);
2234 2377
2235 /* figure out which skill it uses, if it uses one */ 2378 /* figure out which skill it uses, if it uses one */
2236 if (spell->skill) { 2379 if (spell->skill)
2380 {
2237 for (i=1; i< NUM_SKILLS; i++) 2381 for (i = 1; i < NUM_SKILLS; i++)
2238 if (!strcmp(spell->skill, skill_names[i])) { 2382 if (!strcmp (spell->skill, skill_names[i]))
2383 {
2239 skill = i+CS_STAT_SKILLINFO; 2384 skill = i + CS_STAT_SKILLINFO;
2240 break; 2385 break;
2386 }
2241 } 2387 }
2242 }
2243 SockList_AddChar(sl, skill);
2244 2388
2245 SockList_AddInt(sl, spell->path_attuned); 2389 /* send the current values */
2246 SockList_AddInt(sl, (spell->face)?spell->face->number:0); 2390 sl << uint32 (spell->count)
2247 2391 << uint16 (spell->level)
2248 len = strlen(spell->name); 2392 << uint16 (spell->casting_time)
2249 SockList_AddChar(sl, (char)len); 2393 << uint16 (spell->last_sp)
2250 memcpy(sl->buf+sl->len, spell->name, len); 2394 << uint16 (spell->last_grace)
2251 sl->len+=len; 2395 << uint16 (spell->last_eat)
2252 2396 << uint8 (skill)
2253 if (!spell->msg) { 2397 << uint32 (spell->path_attuned)
2254 SockList_AddShort(sl, 0); 2398 << uint32 (spell->face ? spell->face->number : 0)
2255 } 2399 << data8 (spell->name)
2256 else { 2400 << data16 (spell->msg);
2257 len = strlen(spell->msg);
2258 SockList_AddShort(sl, len);
2259 memcpy(sl->buf+sl->len, spell->msg, len);
2260 sl->len+=len;
2261 }
2262} 2401}
2263 2402
2264/** 2403/**
2265 * This tells the client to add the spell *ob, if *ob is NULL, then add 2404 * This tells the client to add the spell *ob, if *ob is NULL, then add
2266 * all spells in the player's inventory. 2405 * all spells in the player's inventory.
2267 */ 2406 */
2407void
2268void esrv_add_spells(player *pl, object *spell) { 2408esrv_add_spells (player *pl, object *spell)
2269 SockList sl; 2409{
2270 if (!pl) { 2410 if (!pl)
2411 {
2271 LOG(llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2412 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2272 return; 2413 return;
2273 } 2414 }
2415
2274 if (!pl->socket.monitor_spells) return; 2416 if (!pl->socket->monitor_spells)
2275 sl.buf = (unsigned char*) malloc(MAXSOCKBUF); 2417 return;
2276 strcpy((char*)sl.buf,"addspell "); 2418
2277 sl.len=strlen((char*)sl.buf); 2419 packet sl;
2420
2421 sl << "addspell ";
2422
2278 if (!spell) { 2423 if (!spell)
2424 {
2279 for (spell=pl->ob->inv; spell!=NULL; spell=spell->below) { 2425 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2426 {
2280 /* were we to simply keep appending data here, we could exceed 2427 /* were we to simply keep appending data here, we could exceed
2281 * MAXSOCKBUF if the player has enough spells to add, we know that 2428 * MAXSOCKBUF if the player has enough spells to add, we know that
2282 * append_spells will always append 19 data bytes, plus 4 length 2429 * append_spells will always append 19 data bytes, plus 4 length
2283 * bytes and 3 strings (because that is the spec) so we need to 2430 * bytes and 3 strings (because that is the spec) so we need to
2284 * check that the length of those 3 strings, plus the 23 bytes, 2431 * check that the length of those 3 strings, plus the 23 bytes,
2285 * won't take us over the length limit for the socket, if it does, 2432 * won't take us over the length limit for the socket, if it does,
2286 * we need to send what we already have, and restart packet formation 2433 * we need to send what we already have, and restart packet formation
2287 */ 2434 */
2288 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 2435 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
2289 * to show add_spell is 26 bytes + 2 strings. However, the overun 2436 * to show add_spell is 26 bytes + 2 strings. However, the overun
2290 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 2437 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2291 * like it will fix this 2438 * like it will fix this
2292 */ 2439 */
2293 if (spell->type != SPELL) continue; 2440 if (spell->type != SPELL)
2294 if (sl.len >= (MAXSOCKBUF - (26 + strlen(spell->name) + 2441 continue;
2295 (spell->msg?strlen(spell->msg):0)))) { 2442
2296 Send_With_Handling(&pl->socket, &sl); 2443 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2297 strcpy((char*)sl.buf,"addspell "); 2444 {
2298 sl.len=strlen((char*)sl.buf); 2445 pl->socket->send_packet (sl);
2446
2447 sl.reset ();
2448 sl << "addspell ";
2449 }
2450
2451 append_spell (pl, sl, spell);
2452 }
2299 } 2453 }
2454 else if (spell->type != SPELL)
2455 {
2456 LOG (llevError, "Asked to send a non-spell object as a spell");
2457 return;
2458 }
2459 else
2300 append_spell(pl, &sl, spell); 2460 append_spell (pl, sl, spell);
2301 } 2461
2302 }
2303 else if (spell->type != SPELL) {
2304 LOG(llevError, "Asked to send a non-spell object as a spell");
2305 return;
2306 }
2307 else append_spell(pl, &sl, spell);
2308 if (sl.len >= MAXSOCKBUF) { 2462 if (sl.length () >= MAXSOCKBUF)
2463 {
2309 LOG(llevError,"Buffer overflow in esrv_add_spells!\n"); 2464 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2310 fatal(0); 2465 fatal (0);
2311 } 2466 }
2467
2312 /* finally, we can send the packet */ 2468 /* finally, we can send the packet */
2313 Send_With_Handling(&pl->socket, &sl); 2469 pl->socket->send_packet (sl);
2314 free(sl.buf);
2315} 2470}
2316 2471

Diff Legend

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