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

Diff Legend

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