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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.2 by root, Thu Aug 17 20:23:32 2006 UTC vs.
Revision 1.33 by root, Thu Dec 14 01:21:58 2006 UTC

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

Diff Legend

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