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.7 by root, Mon Aug 21 07:13:32 2006 UTC vs.
Revision 1.80 by root, Fri Mar 16 02:51:08 2007 UTC

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

Diff Legend

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