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

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

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

Diff Legend

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