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.8 by root, Thu Aug 24 10:58:39 2006 UTC vs.
Revision 1.68 by root, Sun Mar 4 19:36:12 2007 UTC

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

Diff Legend

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