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.14 by elmex, Mon Sep 4 17:14:10 2006 UTC vs.
Revision 1.40 by root, Fri Dec 15 04:21:29 2006 UTC

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

Diff Legend

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