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.10 by root, Fri Aug 25 17:11:54 2006 UTC vs.
Revision 1.79 by root, Thu Mar 15 16:25:45 2007 UTC

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

Diff Legend

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