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.188 by root, Mon Oct 29 23:55:57 2012 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,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2001 Mark Wedel 5 * Copyright (©) 2001 Mark Wedel
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 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>
55 49
56/* This block is basically taken from socket.c - I assume if it works there, 50/* This block is basically taken from socket.c - I assume if it works there,
57 * it should work here. 51 * it should work here.
58 */ 52 */
59#include <sys/types.h> 53#include <sys/types.h>
… …
71 * This table translates the attack numbers as used within the 65 * This table translates the attack numbers as used within the
72 * program to the value we use when sending STATS command to the 66 * 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 67 * client. If a value is -1, then we don't send that to the
74 * client. 68 * client.
75 */ 69 */
76short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS, 70static short atnr_cs_stat[NROFATTACKS] =
77 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC, 71{
78 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID, 72 CS_STAT_RES_PHYS,
79 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ , 73 CS_STAT_RES_MAG,
80 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON, 74 CS_STAT_RES_FIRE,
81 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD, 75 CS_STAT_RES_ELEC,
82 CS_STAT_RES_FEAR, -1 /* Cancellation */ , 76 CS_STAT_RES_COLD,
83 CS_STAT_RES_DEPLETE, CS_STAT_RES_DEATH, 77 CS_STAT_RES_CONF,
84 -1 /* Chaos */ , -1 /* Counterspell */ , 78 CS_STAT_RES_ACID,
85 -1 /* Godpower */ , CS_STAT_RES_HOLYWORD, 79 CS_STAT_RES_DRAIN,
80 -1 /* weaponmagic */,
81 CS_STAT_RES_GHOSTHIT,
82 CS_STAT_RES_POISON,
83 CS_STAT_RES_SLOW,
84 CS_STAT_RES_PARA,
85 CS_STAT_TURN_UNDEAD,
86 CS_STAT_RES_FEAR,
87 -1 /* Cancellation */,
88 CS_STAT_RES_DEPLETE,
89 CS_STAT_RES_DEATH,
90 -1 /* Chaos */,
91 -1 /* Counterspell */,
92 -1 /* Godpower */,
93 CS_STAT_RES_HOLYWORD,
86 CS_STAT_RES_BLIND, 94 CS_STAT_RES_BLIND,
87 -1, /* Internal */ 95 -1, /* Internal */
88 -1, /* life stealing */ 96 -1, /* life stealing */
89 -1 /* Disease - not fully done yet */ 97 -1 /* Disease - not fully done yet */
90}; 98};
91 99
92static void 100static void
93socket_map_scroll (client_socket * ns, int dx, int dy) 101socket_map_scroll (client *ns, int dx, int dy)
94{ 102{
95 struct Map newmap; 103 struct Map newmap;
96 int x, y, mx, my; 104 int x, y, mx, my;
97 105
98 {
99 packet sl;
100
101 sl.printf ("map_scroll %d %d", dx, dy); 106 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
102 ns->send_packet (sl);
103 }
104 107
105 /* If we are using the Map1aCmd, we may in fact send 108 /* If we are using the Map1aCmd, we may in fact send
106 * head information that is outside the viewable map. 109 * head information that is outside the viewable map.
107 * So set the mx,my to the max value we want to 110 * So set the mx,my to the max value we want to
108 * look for. Removed code to do so - it caused extra 111 * look for. Removed code to do so - it caused extra
… …
110 * that much difference in bandwidth. 113 * that much difference in bandwidth.
111 */ 114 */
112 mx = ns->mapx; 115 mx = ns->mapx;
113 my = ns->mapy; 116 my = ns->mapy;
114 117
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 118 /* 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, 119 * (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 120 * if the destination x or y coordinate is outside the viewable
124 * area, we clear the values - otherwise, the old values 121 * area, we clear the values - otherwise, the old values
125 * are preserved, and the check_head thinks it needs to clear them. 122 * are preserved, and the check_head thinks it needs to clear them.
126 */ 123 */
127 for (x = 0; x < mx; x++) 124 for (x = 0; x < mx; x++)
128 {
129 for (y = 0; y < my; y++) 125 for (y = 0; y < my; y++)
130 {
131 if (x >= ns->mapx || y >= ns->mapy) 126 if (x >= ns->mapx || y >= ns->mapy)
132 /* clear cells outside the viewable area */ 127 /* clear cells outside the viewable area */
133 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 128 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) 129 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 */ 130 /* clear newly visible tiles within the viewable area */
136 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 131 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
137 else 132 else
138 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 133 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
139 }
140 }
141 134
142 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 135 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
143 136
144 /* Make sure that the next "map1" command will be sent (even if it is 137 /* Make sure that the next "map1" command will be sent (even if it is
145 * empty). 138 * empty).
… …
148} 141}
149 142
150static void 143static void
151clear_map (player *pl) 144clear_map (player *pl)
152{ 145{
146 pl->ns->mapinfo_queue_clear ();
147
148 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
149
150 pl->ns->force_newmap = false;
151 pl->ns->send_packet ("newmap");
152 pl->ns->floorbox_reset ();
153}
154
155static void
156send_map_info (player *pl)
157{
153 client_socket &socket = *pl->socket; 158 client &socket = *pl->ns;
159 object *ob = pl->viewpoint;
154 160
155 memset (&socket.lastmap, 0, sizeof (socket.lastmap));
156
157 if (socket.newmapcmd == 1) 161 if (socket.mapinfocmd)
162 {
163 if (ob->map && ob->map->path)
164 {
165 int flags = 0;
166
167 // due to historical glitches, the bit ordering and map index ordering differs
168 if (ob->map->tile_path [TILE_NORTH]) flags |= 0x01;
169 if (ob->map->tile_path [TILE_EAST ]) flags |= 0x02;
170 if (ob->map->tile_path [TILE_SOUTH]) flags |= 0x04;
171 if (ob->map->tile_path [TILE_WEST ]) flags |= 0x08;
172 // these two are debatable
173 if (ob->map->tile_path [TILE_UP ]) flags |= 0x10;
174 if (ob->map->tile_path [TILE_DOWN ]) flags |= 0x20;
175
176 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
177 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
178 ob->map->width, ob->map->height, &ob->map->path);
179 }
180 else
158 socket.send_packet ("newmap"); 181 socket.send_packet ("mapinfo current");
159 182 }
160 socket.update_look = 1;
161 socket.look_position = 0;
162} 183}
163 184
164/** check for map change and send new map data */ 185/** check for map/region change and send new map data */
165static void 186static void
166check_map_change (player *pl) 187check_map_change (player *pl)
167{ 188{
168 client_socket &socket = *pl->socket; 189 client &socket = *pl->ns;
169 object *ob = pl->ob; 190 object *ob = pl->viewpoint;
170 char buf[MAX_BUF]; /* eauugggh */
171 191
172 if (socket.current_map != ob->map) 192 region *reg = ob->region ();
193 if (socket.current_region != reg)
194 {
195 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
196 socket.current_region = reg;
173 { 197 }
198
199 // first try to aovid a full newmap on tiled map scrolls
200 if (socket.current_map != ob->map && !socket.force_newmap)
201 {
202 rv_vector rv;
203
204 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
205
206 // manhattan distance is very handy here
207 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
208 {
209 socket.current_map = ob->map;
210 socket.current_x = ob->x;
211 socket.current_y = ob->y;
212
213 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
214 socket.floorbox_reset ();
215 send_map_info (pl);
216 }
217 }
218
219 if (socket.current_map != ob->map || socket.force_newmap)
220 {
221 clear_map (pl);
174 socket.current_map = ob->map; 222 socket.current_map = ob->map;
223 send_map_info (pl);
224 }
225 else if (socket.current_x != ob->x || socket.current_y != ob->y)
226 {
227 int dx = ob->x - socket.current_x;
228 int dy = ob->y - socket.current_y;
175 229
176 clear_map (pl); 230 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
231 socket.floorbox_reset ();
232 }
177 233
178 if (socket.mapinfocmd) 234 socket.current_x = ob->x;
235 socket.current_y = ob->y;
236}
237
238/**
239 * This sends the skill number to name mapping. We ignore
240 * the params - we always send the same info no matter what.
241 */
242static void
243send_skill_info (client *ns, char *params)
244{
245 packet sl;
246 sl << "replyinfo skill_info\n";
247
248 for (int i = 0; i < skillvec.size (); ++i)
249 sl.printf ("%d:%s\n", CS_STAT_SKILLINFO + i, &skillvec [i]->name);
250
251 if (sl.length () > MAXSOCKBUF)
252 cleanup ("buffer overflow in send_skill_info!");
253
254 ns->send_packet (sl);
255}
256
257/**
258 * This sends the spell path to name mapping. We ignore
259 * the params - we always send the same info no matter what.
260 */
261static void
262send_spell_paths (client * ns, char *params)
263{
264 packet sl;
265
266 sl << "replyinfo spell_paths\n";
267
268 for (int i = 0; i < NRSPELLPATHS; i++)
269 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
270
271 if (sl.length () > MAXSOCKBUF)
272 cleanup ("buffer overflow in send_spell_paths!");
273
274 ns->send_packet (sl);
275}
276
277/**
278 * RequestInfo is sort of a meta command. There is some specific
279 * request of information, but we call other functions to provide
280 * that information.
281 */
282void
283RequestInfo (char *buf, int len, client *ns)
284{
285 char *params;
286
287 /* find the first space, make it null, and update the
288 * params pointer.
289 */
290 for (params = buf; *params; params++)
291 if (*params == ' ')
292 {
293 *params++ = 0;
294 break;
295 }
296
297 if (!strcmp (buf, "skill_info"))
298 send_skill_info (ns, params);
299 else if (!strcmp (buf, "spell_paths"))
300 send_spell_paths (ns, params);
301 else
302 {
303 // undo tokenisation above and send replyinfo with the request unchanged
304 if (*params)
305 *--params = ' ';
306
307 ns->send_packet_printf ("replyinfo %s", buf);
308 }
309}
310
311void
312ExtCmd (char *buf, int len, player *pl)
313{
314 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
315}
316
317void
318ExtiCmd (char *buf, int len, client *ns)
319{
320 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
321}
322
323//-GPL
324
325void
326client::mapinfo_queue_clear ()
327{
328 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
329 free (*i);
330
331 mapinfo_queue.clear ();
332}
333
334bool
335client::mapinfo_try (char *buf)
336{
337 char *token = buf;
338 buf += strlen (buf) + 9;
339
340 // initial map and its origin
341 maptile *map = pl->viewpoint->map;
342 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
343 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
344 int max_distance = 8; // limit maximum path length to something generous
345
346 while (*buf && map && max_distance)
347 {
348 int dir = *buf++ - '1';
349
350 // due to historical glitches, the mapinfo index and tile index differs
351 static unsigned char dirmap [] = { TILE_NORTH, TILE_EAST, TILE_SOUTH, TILE_WEST, TILE_UP, TILE_DOWN };
352
353 // maybe we should only allow the four flat directions
354 if (IN_RANGE_EXC (dir, 0, array_length (dirmap)))
179 { 355 {
180 if (ob->map && ob->map->path[0]) 356 dir = dirmap [dir];
357
358 if (!map->tile_path [dir])
359 map = 0;
360 else if (map->tile_available (dir, false))
181 { 361 {
182 int flags = 0; 362 maptile *neigh = map->tile_map [dir];
183 363
184 if (ob->map->tile_path[0]) 364 switch (dir)
185 flags |= 1; 365 {
186 if (ob->map->tile_path[1]) 366 case 0: mapy -= neigh->height; break;
187 flags |= 2; 367 case 2: mapy += map ->height; break;
188 if (ob->map->tile_path[2]) 368 case 3: mapx -= neigh->width ; break;
189 flags |= 4; 369 case 1: mapx += map ->width ; break;
190 if (ob->map->tile_path[3]) 370 }
191 flags |= 8;
192 371
193 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 372 map = neigh;
194 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); 373 --max_distance;
195 } 374 }
196 else 375 else
197 snprintf (buf, MAX_BUF, "mapinfo current"); 376 return 0;
198
199 socket.send_packet (buf);
200 } 377 }
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 378 else
379 max_distance = 0;
380 }
381
382 if (!max_distance)
383 send_packet_printf ("mapinfo %s error", token);
384 else if (!map || !map->path)
385 send_packet_printf ("mapinfo %s nomap", token);
386 else
387 {
388 int flags = 0;
389
390 // due to historical glitches, the bit ordering and map index ordering differs
391 if (map->tile_path [TILE_NORTH]) flags |= 0x01;
392 if (map->tile_path [TILE_EAST ]) flags |= 0x02;
393 if (map->tile_path [TILE_SOUTH]) flags |= 0x04;
394 if (map->tile_path [TILE_WEST ]) flags |= 0x08;
395 // these two are debatable
396 if (map->tile_path [TILE_UP ]) flags |= 0x10;
397 if (map->tile_path [TILE_DOWN ]) flags |= 0x20;
398
399 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
400 }
401
402 return 1;
403}
404
405void
406client::mapinfo_queue_run ()
407{
408 if (mapinfo_queue.empty () || !pl)
409 return;
410
411 for (int i = 0; i < mapinfo_queue.size (); ++i)
412 if (mapinfo_try (mapinfo_queue [i]))
210 { 413 {
211 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 414 free (mapinfo_queue [i]);
212 socket.update_look = 1; 415 mapinfo_queue.erase (i);
213 socket.look_position = 0;
214 } 416 }
215 } 417 else
216 418 ++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} 419}
226 420
227void 421void
228MapInfoCmd (char *buf, int len, player *pl) 422MapInfoCmd (char *buf, int len, player *pl)
229{ 423{
230 // <mapinfo tag spatial tile-path 424 // <mapinfo tag spatial tile-path
231 // >mapinfo tag spatial flags x y w h hash 425 // >mapinfo tag spatial flags x y w h hash
232 426
233 char bigbuf[MAX_BUF], *token;
234
235 token = buf; 427 char *token = buf;
236 // copy token 428
237 if (!(buf = strchr (buf, ' '))) 429 if (!(buf = strchr (buf, ' ')))
238 return; 430 return;
239 431
240 *buf++ = 0;
241
242 if (!strncmp (buf, "spatial ", 8)) 432 if (!strncmp (buf, " spatial ", 9))
243 { 433 {
244 buf += 8; 434 char *copy = strdup (token);
435 copy [buf - token] = 0;
245 436
246 // initial map and its origin 437#if 0
247 maptile *map = pl->ob->map; 438 // this makes only sense when we flush the buffer immediately
248 sint16 dx, dy; 439 if (pl->ns->mapinfo_try (copy))
249 int mapx = pl->socket->mapx / 2 - pl->ob->x; 440 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 441 else
306 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 442#endif
443 pl->ns->mapinfo_queue.push_back (copy);
307 } 444 }
308 else 445 else
309 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 446 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
310
311 pl->socket->send_packet (bigbuf);
312} 447}
313 448
314/** This is the Setup cmd - easy first implementation */ 449/** This is the Setup cmd */
315void 450void
316SetUp (char *buf, int len, client_socket * ns) 451SetUp (char *buf, int len, client * ns)
317{ 452{
318 int s, slen; 453 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} 454}
528 455
529/** 456/**
530 * The client has requested to be added to the game. 457 * 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. 458 * 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, 459 * 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. 460 * it either has to be here or init_sockets needs to be exported.
534 */ 461 */
535void 462void
536AddMeCmd (char *buf, int len, client_socket * ns) 463AddMeCmd (char *buf, int len, client *ns)
537{ 464{
538 Settings oldsettings; 465 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} 466}
548 467
549/** Reply to ExtendedInfos command */ 468//+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
602/*
603#define MSG_TYPE_BOOK 1
604#define MSG_TYPE_CARD 2
605#define MSG_TYPE_PAPER 3
606#define MSG_TYPE_SIGN 4
607#define MSG_TYPE_MONUMENT 5
608#define MSG_TYPE_SCRIPTED_DIALOG 6*/
609
610/** Reply to ExtendedInfos command */
611void
612ToggleExtendedText (char *buf, int len, client_socket * ns)
613{
614 char cmdback[MAX_BUF];
615 char temp[10];
616 char command[50];
617 int info, nextinfo, i, flag;
618
619 cmdback[0] = '\0';
620
621 nextinfo = 0;
622 while (1)
623 {
624 /* 1. Extract an info */
625 info = nextinfo;
626
627 while ((info < len) && (buf[info] == ' '))
628 info++;
629
630 if (info >= len)
631 break;
632
633 nextinfo = info + 1;
634
635 while ((nextinfo < len) && (buf[nextinfo] != ' '))
636 nextinfo++;
637
638 if (nextinfo - info >= 49) /*Erroneous info asked */
639 continue;
640
641 strncpy (command, &(buf[info]), nextinfo - info);
642 command[nextinfo - info] = '\0';
643 /* 2. Interpret info */
644 i = sscanf (command, "%d", &flag);
645
646 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
647 ns->supported_readables |= (1 << flag);
648 /*3. Next info */
649 }
650
651 /* Send resulting state */
652 strcpy (cmdback, "ExtendedTextSet");
653
654 for (i = 0; i <= MSG_TYPE_LAST; i++)
655 if (ns->supported_readables & (1 << i))
656 {
657 strcat (cmdback, " ");
658 snprintf (temp, sizeof (temp), "%d", i);
659 strcat (cmdback, temp);
660 }
661
662 ns->send_packet (cmdback);
663}
664
665/**
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 469
715/** 470/**
716 * This handles the general commands from the client (ie, north, fire, cast, 471 * This handles the general commands from the client (ie, north, fire, cast,
717 * etc.) 472 * etc.)
718 */ 473 */
719void 474void
720PlayerCmd (char *buf, int len, player *pl) 475PlayerCmd (char *buf, int len, player *pl)
721{ 476{
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 477 /* Check if there is a count. In theory, a zero count could also be
734 * sent, so check for that also. 478 * sent, so check for that also.
735 */ 479 */
736 if (atoi (buf) || buf[0] == '0') 480 if (atoi (buf) || buf[0] == '0')
737 { 481 {
738 pl->count = atoi ((char *) buf); 482 pl->count = atoi ((char *) buf);
483
739 buf = strchr (buf, ' '); /* advance beyond the numbers */ 484 buf = strchr (buf, ' '); /* advance beyond the numbers */
740 if (!buf) 485 if (!buf)
741 {
742#ifdef ESRV_DEBUG
743 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
744#endif
745 return; 486 return;
746 } 487
747 buf++; 488 buf++;
748 } 489 }
749 /* This should not happen anymore. */ 490
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); 491 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 492
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. 493 /* Perhaps something better should be done with a left over count.
817 * Cleaning up the input should probably be done first - all actions 494 * 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 495 * for the command that issued the count should be done before any other
819 * commands. 496 * commands.
820 */ 497 */
821 pl->count = 0; 498 pl->count = 0;
499}
822 500
823 if (FABS (pl->ob->speed) < 0.001) 501/**
824 time = MAX_TIME * 100; 502 * This handles the general commands from the client (ie, north, fire, cast,
825 else 503 * etc.). It is a lot like PlayerCmd above, but is called with the
504 * 'ncom' method which gives more information back to the client so it
505 * can throttle.
506 */
507void
508NewPlayerCmd (char *buf, int len, player *pl)
509{
510 if (len <= 6)
511 {
512 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
513 return;
514 }
515
516 uint16 cmdid = net_uint16 ((uint8 *)buf);
517 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
518
519 /* -1 is special - no repeat, but don't update */
520 if (repeat != -1)
521 pl->count = repeat;
522
523 buf += 6; //len -= 6;
524
525 execute_newserver_command (pl->ob, buf);
526
527 /* Perhaps something better should be done with a left over count.
528 * Cleaning up the input should probably be done first - all actions
529 * for the command that issued the count should be done before any other
530 * commands.
531 */
532 pl->count = 0;
533
534 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
535 int time = pl->ob->has_active_speed ()
826 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 536 ? (int) (MAX_TIME / pl->ob->speed)
537 : MAX_TIME * 100;
827 538
828 /* Send confirmation of command execution now */ 539 /* Send confirmation of command execution now */
829 540 packet sl ("comc");
830 packet sl;
831 sl << "comc " << uint16 (pktlen) << uint32 (time); 541 sl << uint16 (cmdid) << uint32 (time);
832 pl->socket->send_packet (sl); 542 pl->ns->send_packet (sl);
833} 543}
834
835 544
836/** This is a reply to a previous query. */ 545/** This is a reply to a previous query. */
837void 546void
838ReplyCmd (char *buf, int len, player *pl) 547ReplyCmd (char *buf, int len, client *ns)
839{ 548{
549 if (ns->state == ST_CUSTOM)
550 {
551 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
552 return;
553 }
554
555 if (!ns->pl)
556 return; //TODO: depends on the exact reply we are after
557 //TODO: but right now, we always have a ns->pl
558
559 player *pl = ns->pl;
560
840 /* This is to synthesize how the data would be stored if it 561 /* 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 562 * was normally entered. A bit of a hack, and should be cleaned up
842 * once all the X11 code is removed from the server. 563 * once all the X11 code is removed from the server.
843 * 564 *
844 * We pass 13 to many of the functions because this way they 565 * We pass 13 to many of the functions because this way they
845 * think it was the carriage return that was entered, and the 566 * think it was the carriage return that was entered, and the
846 * function then does not try to do additional input. 567 * function then does not try to do additional input.
847 */ 568 */
848 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 569 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
849 570
850 /* this avoids any hacking here */ 571 /* this avoids any hacking here */
851 572
852 switch (pl->state) 573 switch (ns->state)
853 { 574 {
854 case ST_PLAYING: 575 case ST_PLAYING:
855 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 576 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
856 break; 577 break;
857 578
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 */ 579 case ST_GET_PARTY_PASSWORD: /* Get password for party */
893 receive_party_password (pl->ob, 13); 580 receive_party_password (pl->ob, 13);
894 break; 581 break;
895 582
896 default: 583 default:
897 LOG (llevError, "Unknown input state: %d\n", pl->state); 584 LOG (llevError, "Unknown input state: %d\n", ns->state);
898 } 585 }
899} 586}
900 587
901/** 588/**
902 * Client tells its version. If there is a mismatch, we close the 589 * Client tells its version info.
903 * socket. In real life, all we should care about is the client having
904 * 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
906 * problem.
907 */ 590 */
908void 591void
909VersionCmd (char *buf, int len, client_socket * ns) 592VersionCmd (char *buf, int len, client *ns)
910{ 593{
911 char *cp; 594 INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
912 char version_warning[256];
913
914 if (!buf)
915 {
916 LOG (llevError, "CS: received corrupted version command\n");
917 return;
918 }
919
920 ns->cs_version = atoi (buf);
921 ns->sc_version = ns->cs_version;
922 if (VERSION_CS != ns->cs_version)
923 {
924#ifdef ESRV_DEBUG
925 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
926#endif
927 }
928 cp = strchr (buf + 1, ' ');
929 if (!cp)
930 return;
931 ns->sc_version = atoi (cp);
932 if (VERSION_SC != ns->sc_version)
933 {
934#ifdef ESRV_DEBUG
935 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
936#endif
937 }
938 cp = strchr (cp + 1, ' ');
939 if (cp)
940 {
941 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);
942
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)
955 {
956 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
957 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
958 ns->send_packet (version_warning);
959 }
960
961 }
962} 595}
963 596
964/** sound related functions. */ 597/** sound related functions. */
965
966void 598void
967SetSound (char *buf, int len, client_socket * ns) 599SetSound (char *buf, int len, client * ns)
968{ 600{
969 ns->sound = atoi (buf); 601 ns->sound = atoi (buf);
970} 602}
971 603
972/** client wants the map resent */ 604/** client wants the map resent */
973
974void 605void
975MapRedrawCmd (char *buf, int len, player *pl) 606MapRedrawCmd (char *buf, int len, player *pl)
976{ 607{
977
978/* This function is currently disabled; just clearing the map state results in 608/* 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. 609 * display errors. It should clear the cache and send a newmap command.
980 * Unfortunately this solution does not work because some client versions send 610 * Unfortunately this solution does not work because some client versions send
981 * a mapredraw command after receiving a newmap command. 611 * a mapredraw command after receiving a newmap command.
982 */ 612 */
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} 613}
991 614
992/** 615/**
993 * Moves an object (typically, container to inventory). 616 * Moves an object (typically, container to inventory).
994 * syntax is: move (to) (tag) (nrof) 617 * syntax is: move (to) (tag) (nrof)
995 */ 618 */
996void 619void
997MoveCmd (char *buf, int len, player *pl) 620MoveCmd (char *buf, int len, player *pl)
998{ 621{
999 int vals[3], i; 622 int to, tag, nrof;
1000 623
1001 /* A little funky here. We only cycle for 2 records, because 624 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 { 625 {
1008 vals[i] = atoi (buf);
1009 if (!(buf = strchr (buf, ' ')))
1010 {
1011 LOG (llevError, "Incomplete move command: %s\n", buf); 626 LOG (llevError, "Incomplete move command: %s\n", buf);
1012 return; 627 return;
1013 }
1014 buf++;
1015 } 628 }
1016 vals[2] = atoi (buf);
1017 629
1018/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 630 esrv_move_object (pl->ob, to, tag, nrof);
1019 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1020} 631}
1021
1022
1023 632
1024/****************************************************************************** 633/******************************************************************************
1025 * 634 *
1026 * Start of commands the server sends to the client. 635 * Start of commands the server sends to the client.
1027 * 636 *
… …
1030/** 639/**
1031 * Asks the client to query the user. This way, the client knows 640 * 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) 641 * it needs to send something back (vs just printing out a message)
1033 */ 642 */
1034void 643void
1035send_query (client_socket * ns, uint8 flags, char *text) 644send_query (client *ns, uint8 flags, const char *text)
1036{ 645{
1037 char buf[MAX_BUF];
1038
1039 sprintf (buf, "query %d %s", flags, text ? text : ""); 646 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1040 ns->send_packet (buf); 647}
648
649/**
650 * Get player's current range attack in obuf.
651 */
652static void
653rangetostring (player *pl, char *obuf)
654{
655 dynbuf_text &buf = msg_dynbuf; buf.clear ();
656
657#if 0
658 // print ranged/chosen_skill etc. objects every call
659 printf ("%s %s => %s (%s)\n",
660 pl->ranged_ob ? &pl->ranged_ob->name : "-",
661 pl->combat_ob ? &pl->combat_ob->name : "-",
662 pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
663 pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
664 );
665#endif
666
667 if (pl->ranged_ob)
668 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
669
670 if (pl->combat_ob)
671 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
672
673#if 0
674 //TODO: remove this when slot system is working, this is only for debugging
675 if (pl->ob->chosen_skill)
676 buf << " Skill*: " << pl->ob->chosen_skill->name;
677#endif
678
679 //TODO: maybe golem should become the current_weapon, quite simply?
680 if (pl->golem)
681 buf << " Golem*: " << pl->golem->name;
682
683 buf << '\0';
684 buf.linearise (obuf);
1041} 685}
1042 686
1043#define AddIfInt64(Old,New,Type) if (Old != New) {\ 687#define AddIfInt64(Old,New,Type) if (Old != New) {\
1044 Old = New; \ 688 Old = New; \
1045 sl << uint8 (Type) << uint64 (New); \ 689 sl << uint8 (Type) << uint64 (New); \
… …
1053#define AddIfShort(Old,New,Type) if (Old != New) {\ 697#define AddIfShort(Old,New,Type) if (Old != New) {\
1054 Old = New; \ 698 Old = New; \
1055 sl << uint8 (Type) << uint16 (New); \ 699 sl << uint8 (Type) << uint16 (New); \
1056 } 700 }
1057 701
1058#define AddIfFloat(Old,New,Type) if (Old != New) {\ 702#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
1059 Old = New; \ 703 Old = New; \
1060 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 704 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
1061 } 705 }
1062 706
1063#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 707#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1064 free(Old); Old = strdup (New);\ 708 free(Old); Old = strdup (New);\
1065 sl << uint8 (Type) << data8 (New); \ 709 sl << uint8 (Type) << data8 (New); \
… …
1072 * commands for now. 716 * commands for now.
1073 */ 717 */
1074void 718void
1075esrv_update_stats (player *pl) 719esrv_update_stats (player *pl)
1076{ 720{
721 client *ns = pl->ns;
722 if (!ns)
723 return;
724
725 object *ob = pl->observe;
726 if (!ob)
727 return;
728
729 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
730
731 packet sl ("stats");
732
733 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
734 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
735 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
736 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
737 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
738 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
739 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
740 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
741 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
742 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
743 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
744 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
745 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
746
747 for (int s = 0; s < CS_NUM_SKILLS; s++)
748 if (object *skill = opl->last_skill_ob [s])
749 if (skill->stats.exp != ns->last_skill_exp [s])
750 {
751 ns->last_skill_exp [s] = skill->stats.exp;
752
753 /* Always send along the level if exp changes. This is only
754 * 1 extra byte, but keeps processing simpler.
755 */
756 sl << uint8 (CS_STAT_SKILLINFO + s)
757 << uint8 (skill->level)
758 << uint64 (skill->stats.exp);
759 }
760
761 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
762 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
763 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
764 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
765 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
766 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
767 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
768 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
769 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
770
771 int flags = (opl->fire_on ? SF_FIREON : 0)
772 | (opl->run_on ? SF_RUNON : 0);
773
774 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
775
776 for (int i = 0; i < NROFATTACKS; i++)
777 /* Skip ones we won't send */
778 if (atnr_cs_stat[i] >= 0)
779 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
780
781 if (pl->ns->monitor_spells)
782 {
783 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
784 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
785 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
786 }
787
1077 char buf[MAX_BUF]; 788 char buf[MAX_BUF];
1078 uint16 flags;
1079
1080 packet sl;
1081 sl << "stats ";
1082
1083 if (pl->ob != NULL)
1084 {
1085 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
1086 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
1087 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);
1088 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);
1089 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);
1090 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);
1091 AddIfShort (pl->last_stats.Str, pl->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);
1096 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1097 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1098 }
1099
1100 if (pl->socket->exp64)
1101 {
1102 uint8 s;
1103
1104 for (s = 0; s < NUM_SKILLS; s++)
1105 {
1106 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1107 {
1108 /* Always send along the level if exp changes. This is only
1109 * 1 extra byte, but keeps processing simpler.
1110 */
1111 sl << uint8 (s + CS_STAT_SKILLINFO)
1112 << uint8 (pl->last_skill_ob[s]->level)
1113 << uint64 (pl->last_skill_ob[s]->stats.exp);
1114
1115 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1116 }
1117 }
1118 }
1119
1120 if (pl->socket->exp64)
1121 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1122 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++)
1150 {
1151 /* Skip ones we won't send */
1152 if (atnr_cs_stat[i] == -1)
1153 continue;
1154
1155 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1156 }
1157 }
1158
1159 if (pl->socket->monitor_spells)
1160 {
1161 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1162 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
1163 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1164 }
1165
1166 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 789 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
1167 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 790 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1168 set_title (pl->ob, buf); 791 set_title (ob, buf);
1169 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 792 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1170 793
1171 /* Only send it away if we have some actual data */ 794 /* Only send it away if we have some actual data */
1172 if (sl.length () > 6) 795 if (sl.length () > 6)
1173 pl->socket->send_packet (sl); 796 ns->send_packet (sl);
1174} 797}
1175 798
1176/** 799/**
1177 * Tells the client that here is a player it should start using. 800 * Tells the client that here is a player it should start using.
1178 */ 801 */
1179void 802void
1180esrv_new_player (player *pl, uint32 weight) 803esrv_new_player (player *pl)
1181{ 804{
1182 pl->last_weight = weight; 805 sint32 weight = pl->ob->client_weight ();
1183 806
1184 packet sl; 807 packet sl ("player");
1185 sl << "player ";
1186 808
1187 sl << uint32 (pl->ob->count) 809 sl << uint32 (pl->ob->count)
1188 << uint32 (weight) 810 << uint32 (weight)
1189 << uint32 (pl->ob->face->number) 811 << uint32 (pl->ob->face)
1190 << data8 (pl->ob->name); 812 << data8 (pl->ob->name);
1191 813
1192 pl->socket->send_packet (sl); 814 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); 815 pl->ns->send_packet (sl);
1235
1236 ns->anims_sent[anim_num] = 1;
1237} 816}
1238
1239 817
1240/****************************************************************************** 818/******************************************************************************
1241 * 819 *
1242 * Start of map related commands. 820 * Start of map related commands.
1243 * 821 *
1244 ******************************************************************************/ 822 ******************************************************************************/
1245 823
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 */ 824/** Clears a map cell */
1375static void 825static void
1376map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 826map_clearcell (struct MapCell *cell, int count)
1377{ 827{
1378 cell->faces[0] = face0; 828 cell->faces[0] = 0;
1379 cell->faces[1] = face1; 829 cell->faces[1] = 0;
1380 cell->faces[2] = face2; 830 cell->faces[2] = 0;
831 cell->smooth[0] = 0;
832 cell->smooth[1] = 0;
833 cell->smooth[2] = 0;
1381 cell->count = count; 834 cell->count = count;
1382 cell->stat_hp = 0; 835 cell->stat_hp = 0;
1383 cell->flags = 0; 836 cell->flags = 0;
1384 cell->player = 0; 837 cell->player = 0;
1385} 838}
1386 839
1387#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1388#define MAX_LAYERS 3 840#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 841
1445/** 842/**
1446 * Removes the need to replicate the same code for each layer. 843 * Removes the need to replicate the same code for each layer.
1447 * this returns true if this space is now in fact different than 844 * this returns true if this space is now in fact different than
1448 * it was. 845 * it was.
1449 * sl is the socklist this data is going into. 846 * sl is the socklist this data is going into.
1450 * ns is the socket we are working on - all the info we care 847 * 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 848 * about is in this socket structure, so now need not pass the
1452 * entire player object. 849 * 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 850 * 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) 851 * 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 852 * take. Interesting to note that before this function, the map1 function
1459 * numbers the spaces differently - I think this was a leftover from 853 * 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 854 * 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 855 * the case, it seems to make more sense to have these layer values
1462 * actually match. 856 * actually match.
1463 */ 857 */
1464
1465static int 858static int
1466update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 859update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1467{ 860{
1468 object *ob, *head; 861 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 862
1512 /* If there is no object for this space, or if the face for the object 863 /* 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. 864 * is the blank face, set the face number to zero.
1514 * else if we have the stored head object for this space, that takes 865 * else if we have the stored head object for this space, that takes
1515 * precedence over the other object for this space. 866 * precedence over the other object for this space.
1516 * otherwise, we do special head processing 867 * otherwise, we do special head processing
1517 */ 868 */
1518 if (!ob || ob->face == blank_face) 869 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 870
1652 /* We've gotten what face we want to use for the object. Now see if 871 /* 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. 872 * if it has changed since we last sent it to the client.
1654 */ 873 */
1655 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 874 if (lastcell.faces[layer] != face_num)
1656 { 875 {
1657 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 876 lastcell.faces[layer] = face_num;
877
1658 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 878 if (!ns.faces_sent[face_num])
879 if (ob)
880 ns.send_faces (ob);
881 else
1659 esrv_send_face (&ns, face_num, 0); 882 ns.send_face (face_num, 10);
1660 883
1661 sl << uint16 (face_num); 884 sl << uint16 (face_num);
1662 return 1; 885 return 1;
1663 } 886 }
1664 887
1665 /* Nothing changed */ 888 /* Nothing changed */
1666 return 0; 889 return 0;
1667} 890}
1668 891
1669/** 892/**
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
1688static inline int
1689update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1690{
1691 object *ob;
1692 int smoothlevel; /* old face_num; */
1693
1694 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1695
1696 /* If there is no object for this space, or if the face for the object
1697 * is the blank face, set the smoothlevel to zero.
1698 */
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
1953 {
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}
2148
2149/**
2150 * Draws client map. 893 * Draws client map.
2151 */ 894 */
2152void 895void
2153draw_client_map (object *pl) 896draw_client_map (player *pl)
2154{ 897{
2155 int i, j; 898 object *ob = pl->viewpoint;
2156 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 899 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; 900 return;
2167 }
2168
2169 pm = pl->map;
2170 901
2171 /* If player is just joining the game, he isn't here yet, so the map 902 /* 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 903 * can get swapped out. If so, don't try to send them a map. All will
2173 * be OK once they really log in. 904 * be OK once they really log in.
2174 */ 905 */
2175 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 906 if (!ob->map || ob->map->state != MAP_ACTIVE)
2176 return; 907 return;
2177 908
2178 memset (&newmap, 0, sizeof (struct Map)); 909 int startlen, oldlen;
2179 910
2180 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) 911 check_map_change (pl);
2181 { 912 pl->ob->prefetch_surrounding_maps ();
2182 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) 913
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 */ 914 /* do LOS after calls to update_position */
2201 if (pl->contr->do_los) 915 /* unfortunately, we need to udpate los when observing, currently */
916 if (pl->do_los || pl->viewpoint != pl->ob)
2202 { 917 {
918 pl->do_los = 0;
2203 update_los (pl); 919 pl->update_los ();
2204 pl->contr->do_los = 0;
2205 } 920 }
2206 921
2207 /* Big maps need a different drawing mechanism to work */
2208 draw_client_map1 (pl);
2209}
2210
2211
2212/*****************************************************************************/
2213
2214/* 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 */
2217
2218/* manage it ! */
2219
2220/*****************************************************************************/
2221void
2222send_plugin_custom_message (object *pl, char *buf)
2223{
2224 pl->contr->socket->send_packet (buf);
2225}
2226
2227/** 922 /**
2228 * This sends the skill number to name mapping. We ignore 923 * This function uses the new map1 protocol command to send the map
2229 * the params - we always send the same info no matter what. 924 * to the client. It is necessary because the old map command supports
925 * a maximum map size of 15x15.
926 * This function is much simpler than the old one. This is because
927 * the old function optimized to send as few face identifiers as possible,
928 * at the expense of sending more coordinate location (coordinates were
929 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
930 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
931 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
932 * and use the other 4 bits for other informatiion. For full documentation
933 * of what we send, see the doc/Protocol file.
934 * I will describe internally what we do:
935 * the ns->lastmap shows how the map last looked when sent to the client.
936 * in the lastmap structure, there is a cells array, which is set to the
937 * maximum viewable size (As set in config.h).
938 * in the cells, there are faces and a count value.
939 * we use the count value to hold the darkness value. If -1, then this space
940 * is not viewable.
941 * we use faces[0] faces[1] faces[2] to hold what the three layers
942 * look like.
2230 */ 943 */
2231void
2232send_skill_info (client_socket *ns, char *params)
2233{
2234 packet sl;
2235 sl << "replyinfo skill_info\n";
2236 944
2237 for (int i = 1; i < NUM_SKILLS; i++) 945 client &socket = *pl->ns;
2238 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2239 946
2240 if (sl.length () >= MAXSOCKBUF) 947 packet sl ("map1a");
948
949 startlen = sl.length ();
950
951 int hx = socket.mapx / 2;
952 int hy = socket.mapy / 2;
953
954 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
955 int ax = dx + hx;
956 int ay = dy + hy;
957
958 int mask = (ax << 10) | (ay << 4);
959 MapCell &lastcell = socket.lastmap.cells[ax][ay];
960
961 /* If the coordinates are not valid, or it is too dark to see,
962 * we tell the client as such
963 */
964 if (!m)
2241 { 965 {
2242 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 966 /* space is out of map. Update space and clear values
2243 fatal (0); 967 * if this hasn't already been done. If the space is out
968 * of the map, it shouldn't have a head.
969 */
970 if (lastcell.count != -1)
971 {
972 sl << uint16 (mask);
973 map_clearcell (&lastcell, -1);
974 }
975
976 continue;
2244 } 977 }
2245 978
2246 ns->send_packet (sl); 979 int d = pl->blocked_los_uc (dx, dy);
2247}
2248 980
2249/** 981 if (d > 3)
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 { 982 {
2265 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 983 /* This block deals with spaces that are not visible for whatever
2266 fatal (0); 984 * reason. Still may need to send the head for this space.
985 */
986 if (lastcell.count != -1
987 || lastcell.faces[0]
988 || lastcell.faces[1]
989 || lastcell.faces[2]
990 || lastcell.stat_hp
991 || lastcell.flags
992 || lastcell.player)
993 sl << uint16 (mask);
994
995 /* properly clear a previously sent big face */
996 map_clearcell (&lastcell, -1);
2267 } 997 }
998 else
999 {
1000 /* In this block, the space is visible.
1001 */
2268 1002
1003 /* Rather than try to figure out what everything that we might
1004 * need to send is, then form the packet after that,
1005 * we presume that we will in fact form a packet, and update
1006 * the bits by what we do actually send. If we send nothing,
1007 * we just back out sl.length () to the old value, and no harm
1008 * is done.
1009 * I think this is simpler than doing a bunch of checks to see
1010 * what if anything we need to send, setting the bits, then
1011 * doing those checks again to add the real data.
1012 */
1013 oldlen = sl.length ();
1014
1015 sl << uint16 (mask);
1016
1017 unsigned char dummy;
1018 unsigned char *last_ext = &dummy;
1019
1020 /* Darkness changed */
1021 if (lastcell.count != d)
1022 {
1023 mask |= 0x8;
1024
1025 *last_ext |= 0x80;
1026 last_ext = &sl[sl.length ()];
1027 sl << uint8 (d);
1028 }
1029
1030 lastcell.count = d;
1031
1032 mapspace &ms = m->at (nx, ny);
1033 ms.update ();
1034
1035 // extmap handling
1036 uint8 stat_hp = 0;
1037 uint8 stat_width = 0;
1038 uint8 flags = 0;
1039 tag_t player = 0;
1040
1041 // send hp information, if applicable
1042 if (object *op = ms.faces_obj [0])
1043 if (op->is_head () && !op->invisible)
1044 {
1045 if (op->stats.maxhp > op->stats.hp
1046 && op->stats.maxhp > 0
1047 && (op->type == PLAYER
1048 || op->type == DOOR // does not work, have maxhp 0
1049 || op->flag [FLAG_MONSTER]
1050 || op->flag [FLAG_ALIVE]
1051 || op->flag [FLAG_GENERATOR]))
1052 {
1053 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1054 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1055 }
1056
1057 if (expect_false (op->has_dialogue ()))
1058 flags |= 1;
1059
1060 if (expect_false (op->type == PLAYER))
1061 player = op == ob ? pl->ob->count
1062 : op == pl->ob ? ob->count
1063 : op->count;
1064 }
1065
1066 if (expect_false (lastcell.stat_hp != stat_hp))
1067 {
1068 lastcell.stat_hp = stat_hp;
1069
1070 mask |= 0x8;
1071 *last_ext |= 0x80;
1072 last_ext = &sl[sl.length ()];
1073
1074 sl << uint8 (5) << uint8 (stat_hp);
1075
1076 if (stat_width > 1)
1077 {
1078 *last_ext |= 0x80;
1079 last_ext = &sl[sl.length ()];
1080
1081 sl << uint8 (6) << uint8 (stat_width);
1082 }
1083 }
1084
1085 if (expect_false (lastcell.player != player))
1086 {
1087 lastcell.player = player;
1088
1089 mask |= 0x8;
1090 *last_ext |= 0x80;
1091 last_ext = &sl[sl.length ()];
1092
1093 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1094 }
1095
1096 if (expect_false (lastcell.flags != flags))
1097 {
1098 lastcell.flags = flags;
1099
1100 mask |= 0x8;
1101 *last_ext |= 0x80;
1102 last_ext = &sl[sl.length ()];
1103
1104 sl << uint8 (8) << uint8 (flags);
1105 }
1106
1107 // faces
1108
1109 /* Floor face */
1110 if (update_space (sl, socket, ms, lastcell, 2))
1111 mask |= 0x4;
1112
1113 /* Middle face */
1114 if (update_space (sl, socket, ms, lastcell, 1))
1115 mask |= 0x2;
1116
1117 if (expect_false (ob->invisible)
1118 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1119 && ms.player () == ob)
1120 {
1121 // force player to be visible to himself if invisible
1122 if (lastcell.faces[0] != ob->face)
1123 {
1124 lastcell.faces[0] = ob->face;
1125
1126 mask |= 0x1;
1127 sl << uint16 (ob->face);
1128
1129 socket.send_faces (ob);
1130 }
1131 }
1132 /* Top face */
1133 else if (update_space (sl, socket, ms, lastcell, 0))
1134 mask |= 0x1;
1135
1136 /* Check to see if we are in fact sending anything for this
1137 * space by checking the mask. If so, update the mask.
1138 * if not, reset the len to that from before adding the mask
1139 * value, so we don't send those bits.
1140 */
1141 if (mask & 0xf)
1142 sl[oldlen + 1] = mask & 0xff;
1143 else
1144 sl.reset (oldlen);
1145 } /* else this is a viewable space */
1146 ordered_mapwalk_end
1147
1148 socket.flush_fx ();
1149
1150 if (sl.length () > startlen || socket.sent_scroll)
1151 {
2269 ns->send_packet (sl); 1152 socket.send_packet (sl);
1153 socket.sent_scroll = 0;
1154 }
2270} 1155}
2271 1156
2272/** 1157/**
2273 * This looks for any spells the player may have that have changed their stats. 1158 * 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 1159 * it then sends an updspell packet for each spell that has changed in this way
2275 */ 1160 */
2276void 1161void
2277esrv_update_spells (player *pl) 1162esrv_update_spells (player *pl)
2278{ 1163{
2279 if (!pl->socket->monitor_spells) 1164 if (!pl->ns)
2280 return; 1165 return;
2281 1166
1167 pl->ns->update_spells = false;
1168
1169 if (!pl->ns->monitor_spells)
1170 return;
1171
2282 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1172 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2283 {
2284 if (spell->type == SPELL) 1173 if (spell->type == SPELL)
2285 { 1174 {
2286 int flags = 0; 1175 int flags = 0;
1176 int val;
2287 1177
2288 /* check if we need to update it */ 1178 /* check if we need to update it */
2289 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1179 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1180 if (spell->cached_sp != val)
2290 { 1181 {
2291 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1182 spell->cached_sp = val;
2292 flags |= UPD_SP_MANA; 1183 flags |= UPD_SP_MANA;
2293 } 1184 }
2294 1185
2295 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1186 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1187 if (spell->cached_grace != val)
2296 { 1188 {
2297 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1189 spell->cached_grace = val;
2298 flags |= UPD_SP_GRACE; 1190 flags |= UPD_SP_GRACE;
2299 } 1191 }
2300 1192
2301 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1193 val = casting_level (pl->ob, spell);
1194 if (spell->cached_eat != val)
2302 { 1195 {
2303 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1196 spell->cached_eat = val;
2304 flags |= UPD_SP_DAMAGE; 1197 flags |= UPD_SP_LEVEL;
2305 } 1198 }
2306 1199
2307 if (flags) 1200 if (flags)
2308 { 1201 {
2309 packet sl; 1202 packet sl;
2310 1203
2311 sl << "updspell " 1204 sl << "updspell "
2312 << uint8 (flags) 1205 << uint8 (flags)
2313 << uint32 (spell->count); 1206 << uint32 (spell->count);
2314 1207
2315 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1208 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
2316 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1209 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
2317 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1210 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
2318 1211
2319 pl->socket->send_packet (sl); 1212 pl->ns->send_packet (sl);
2320 } 1213 }
2321 } 1214 }
2322 }
2323} 1215}
2324 1216
2325void 1217void
2326esrv_remove_spell (player *pl, object *spell) 1218esrv_remove_spell (player *pl, object *spell)
2327{ 1219{
2328 if (!pl->socket->monitor_spells) 1220 if (!pl->ns->monitor_spells)
2329 return; 1221 return;
2330 1222
2331 if (!pl || !spell || spell->env != pl->ob) 1223 if (!pl || !spell || spell->env != pl->ob)
2332 { 1224 {
2333 LOG (llevError, "Invalid call to esrv_remove_spell"); 1225 LOG (llevError, "Invalid call to esrv_remove_spell");
2334 return; 1226 return;
2335 } 1227 }
2336 1228
2337 packet sl; 1229 packet sl ("delspell");
2338 1230
2339 sl << "delspell "
2340 << uint32 (spell->count); 1231 sl << uint32 (spell->count);
2341 1232
2342 pl->socket->send_packet (sl); 1233 pl->ns->send_packet (sl);
2343} 1234}
2344 1235
2345/* appends the spell *spell to the Socklist we will send the data to. */ 1236/* appends the spell *spell to the Socklist we will send the data to. */
2346static void 1237static void
2347append_spell (player *pl, packet &sl, object *spell) 1238append_spell (player *pl, packet &sl, object *spell)
2348{ 1239{
2349 int len, i, skill = 0; 1240 int skill = 0;
2350 1241
2351 if (!(spell->name)) 1242 if (!(spell->name))
2352 { 1243 {
2353 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1244 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2354 return; 1245 return;
2355 } 1246 }
2356 1247
2357 /* store costs and damage in the object struct, to compare to later */ 1248 /* 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); 1249 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); 1250 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); 1251 spell->cached_eat = casting_level (pl->ob, spell);
2361 1252
2362 /* figure out which skill it uses, if it uses one */ 1253 /* figure out which skill it uses, if it uses one */
2363 if (spell->skill) 1254 if (spell->skill)
2364 { 1255 if (object *tmp = pl->find_skill (spell->skill))
2365 for (i = 1; i < NUM_SKILLS; i++) 1256 skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
2366 if (!strcmp (spell->skill, skill_names[i])) 1257
2367 { 1258 // spells better have a face
2368 skill = i + CS_STAT_SKILLINFO; 1259 if (!spell->face)
2369 break;
2370 }
2371 } 1260 {
1261 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1262 spell->face = face_find ("burnout.x11", blank_face);
1263 }
1264
1265 pl->ns->send_face (spell->face);
2372 1266
2373 /* send the current values */ 1267 /* send the current values */
2374 sl << uint32 (spell->count) 1268 sl << uint32 (spell->count)
2375 << uint16 (spell->level) 1269 << uint16 (spell->level)
2376 << uint16 (spell->casting_time) 1270 << uint16 (spell->casting_time)
2377 << uint16 (spell->last_sp) 1271 << uint16 (spell->cached_sp)
2378 << uint16 (spell->last_grace) 1272 << uint16 (spell->cached_grace)
2379 << uint16 (spell->last_eat) 1273 << uint16 (spell->cached_eat)
2380 << uint8 (skill) 1274 << uint8 (skill)
2381 << uint32 (spell->path_attuned) 1275 << uint32 (spell->path_attuned)
2382 << uint32 (spell->face ? spell->face->number : 0) 1276 << uint32 (spell->face)
2383 << data8 (spell->name) 1277 << data8 (spell->name)
2384 << data16 (spell->msg); 1278 << data16 (spell->msg);
2385} 1279}
2386 1280
2387/** 1281/**
… …
2395 { 1289 {
2396 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 1290 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2397 return; 1291 return;
2398 } 1292 }
2399 1293
2400 if (!pl->socket->monitor_spells) 1294 if (!pl->ns->monitor_spells)
2401 return; 1295 return;
2402 1296
2403 packet sl; 1297 packet sl ("addspell");
2404
2405 sl << "addspell ";
2406 1298
2407 if (!spell) 1299 if (!spell)
2408 { 1300 {
2409 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1301 for (spell = pl->ob->inv; spell; spell = spell->below)
2410 { 1302 {
2411 /* were we to simply keep appending data here, we could exceed 1303 /* were we to simply keep appending data here, we could exceed
2412 * MAXSOCKBUF if the player has enough spells to add, we know that 1304 * MAXSOCKBUF if the player has enough spells to add, we know that
2413 * append_spells will always append 19 data bytes, plus 4 length 1305 * 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 1306 * 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, 1307 * 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, 1308 * 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 1309 * we need to send what we already have, and restart packet formation
2418 */ 1310 */
1311 if (spell->type != SPELL)
1312 continue;
1313
2419 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1314 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
2420 * to show add_spell is 26 bytes + 2 strings. However, the overun 1315 * 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 1316 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2422 * like it will fix this 1317 * like it will fix this
2423 */ 1318 */
2424 if (spell->type != SPELL)
2425 continue;
2426
2427 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1319 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2428 { 1320 {
1321 pl->ns->flush_fx ();
2429 pl->socket->send_packet (sl); 1322 pl->ns->send_packet (sl);
2430 1323
2431 sl.reset (); 1324 sl.reset ();
2432 sl << "addspell "; 1325 sl << "addspell ";
2433 } 1326 }
2434 1327
… …
2441 return; 1334 return;
2442 } 1335 }
2443 else 1336 else
2444 append_spell (pl, sl, spell); 1337 append_spell (pl, sl, spell);
2445 1338
2446 if (sl.length () >= MAXSOCKBUF) 1339 if (sl.length () > MAXSOCKBUF)
2447 {
2448 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1340 cleanup ("buffer overflow in esrv_add_spells!");
2449 fatal (0);
2450 }
2451 1341
2452 /* finally, we can send the packet */ 1342 /* finally, we can send the packet */
1343 pl->ns->flush_fx ();
2453 pl->socket->send_packet (sl); 1344 pl->ns->send_packet (sl);
2454} 1345}
2455 1346
1347//-GPL
1348

Diff Legend

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