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.12 by root, Tue Aug 29 08:01:38 2006 UTC vs.
Revision 1.66 by root, Thu Feb 15 04:04:23 2007 UTC

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

Diff Legend

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