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

Diff Legend

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