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

Diff Legend

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