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

Diff Legend

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