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

Diff Legend

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