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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.4 by root, Fri Aug 18 02:23:28 2006 UTC vs.
Revision 1.32 by root, Thu Dec 14 01:12:35 2006 UTC

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

Diff Legend

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