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

Diff Legend

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