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.21 by root, Sat Sep 16 22:24:13 2006 UTC vs.
Revision 1.132 by elmex, Sun Jun 15 19:34:31 2008 UTC

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

Diff Legend

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