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

Diff Legend

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