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.15 by pippijn, Thu Sep 7 20:03:21 2006 UTC vs.
Revision 1.43 by root, Sat Dec 16 20:16:37 2006 UTC

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

Diff Legend

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