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.4 by root, Fri Aug 18 02:23:28 2006 UTC vs.
Revision 1.65 by root, Sun Jan 21 21:28:27 2007 UTC

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

Diff Legend

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