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

Diff Legend

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