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.16 by root, Sun Sep 10 13:43:33 2006 UTC vs.
Revision 1.100 by root, Mon May 28 21:22:26 2007 UTC

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

Diff Legend

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