ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.8 by root, Thu Aug 24 10:58:39 2006 UTC vs.
Revision 1.59 by pippijn, Sat Jan 6 14:42:31 2007 UTC

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

Diff Legend

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