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.80 by root, Fri Mar 16 02:51:08 2007 UTC vs.
Revision 1.143 by root, Tue Dec 23 06:58:24 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2001 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25/** 24/**
26 * \file 25 * \file
27 * Client handling. 26 * Client handling.
… …
99 */ 98 */
100 mx = ns->mapx; 99 mx = ns->mapx;
101 my = ns->mapy; 100 my = ns->mapy;
102 101
103 /* the x and y here are coordinates for the new map, i.e. if we moved 102 /* the x and y here are coordinates for the new map, i.e. if we moved
104 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, 103 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
105 * if the destination x or y coordinate is outside the viewable 104 * if the destination x or y coordinate is outside the viewable
106 * area, we clear the values - otherwise, the old values 105 * area, we clear the values - otherwise, the old values
107 * are preserved, and the check_head thinks it needs to clear them. 106 * are preserved, and the check_head thinks it needs to clear them.
108 */ 107 */
109 for (x = 0; x < mx; x++) 108 for (x = 0; x < mx; x++)
110 {
111 for (y = 0; y < my; y++) 109 for (y = 0; y < my; y++)
112 {
113 if (x >= ns->mapx || y >= ns->mapy) 110 if (x >= ns->mapx || y >= ns->mapy)
114 /* clear cells outside the viewable area */ 111 /* clear cells outside the viewable area */
115 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 112 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
116 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy) 113 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
117 /* clear newly visible tiles within the viewable area */ 114 /* clear newly visible tiles within the viewable area */
118 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 115 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
119 else 116 else
120 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 117 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
121 }
122 }
123 118
124 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 119 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
125 120
126 /* Make sure that the next "map1" command will be sent (even if it is 121 /* Make sure that the next "map1" command will be sent (even if it is
127 * empty). 122 * empty).
… …
130} 125}
131 126
132static void 127static void
133clear_map (player *pl) 128clear_map (player *pl)
134{ 129{
130 pl->ns->mapinfo_queue_clear ();
131
135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 132 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
136 133
137 pl->ns->force_newmap = false; 134 pl->ns->force_newmap = false;
138 135
139 if (pl->ns->newmapcmd == 1) 136 if (pl->ns->newmapcmd == 1)
140 pl->ns->send_packet ("newmap"); 137 pl->ns->send_packet ("newmap");
141 138
142 pl->ns->floorbox_reset (); 139 pl->ns->floorbox_reset ();
140}
141
142static void
143send_map_info (player *pl)
144{
145 client &socket = *pl->ns;
146 object *ob = pl->observe;
147
148 if (socket.mapinfocmd)
149 {
150 if (ob->map && ob->map->path[0])
151 {
152 int flags = 0;
153
154 if (ob->map->tile_path[0]) flags |= 1;
155 if (ob->map->tile_path[1]) flags |= 2;
156 if (ob->map->tile_path[2]) flags |= 4;
157 if (ob->map->tile_path[3]) flags |= 8;
158
159 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
160 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
161 ob->map->width, ob->map->height, &ob->map->path);
162 }
163 else
164 socket.send_packet ("mapinfo current");
165 }
143} 166}
144 167
145/** check for map/region change and send new map data */ 168/** check for map/region change and send new map data */
146static void 169static void
147check_map_change (player *pl) 170check_map_change (player *pl)
148{ 171{
149 client &socket = *pl->ns; 172 client &socket = *pl->ns;
150 object *ob = pl->ob; 173 object *ob = pl->observe;
151 char buf[MAX_BUF]; /* eauugggh */
152 174
153 if (socket.force_newmap && 0) 175 region *reg = ob->region ();
176 if (socket.current_region != reg)
177 {
178 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
179 socket.current_region = reg;
154 { 180 }
155 // force newmap is used for clients that do not redraw their map 181
156 // after image uploads. 182 // first try to aovid a full newmap on tiled map scrolls
183 if (socket.current_map != ob->map && !socket.force_newmap)
184 {
185 rv_vector rv;
186
187 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
188
189 // manhattan distance is very handy here
190 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
191 {
157 socket.current_map = ob->map; 192 socket.current_map = ob->map;
158 clear_map (pl); 193 socket.current_x = ob->x;
194 socket.current_y = ob->y;
195
196 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
197 socket.floorbox_reset ();
198 send_map_info (pl);
199 }
159 } 200 }
160 else if (socket.current_map != ob->map) 201
202 if (socket.current_map != ob->map || socket.force_newmap)
161 { 203 {
162 clear_map (pl); 204 clear_map (pl);
163 socket.current_map = ob->map; 205 socket.current_map = ob->map;
164 206 send_map_info (pl);
165 if (socket.mapinfocmd)
166 {
167 if (ob->map && ob->map->path[0])
168 {
169 int flags = 0;
170
171 if (ob->map->tile_path[0])
172 flags |= 1;
173 if (ob->map->tile_path[1])
174 flags |= 2;
175 if (ob->map->tile_path[2])
176 flags |= 4;
177 if (ob->map->tile_path[3])
178 flags |= 8;
179
180 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
181 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
182 }
183 else
184 snprintf (buf, MAX_BUF, "mapinfo current");
185
186 socket.send_packet (buf);
187 }
188 } 207 }
189 else if (socket.current_x != ob->x || socket.current_y != ob->y) 208 else if (socket.current_x != ob->x || socket.current_y != ob->y)
190 { 209 {
191 int dx = ob->x - socket.current_x; 210 int dx = ob->x - socket.current_x;
192 int dy = ob->y - socket.current_y; 211 int dy = ob->y - socket.current_y;
… …
200 } 219 }
201 } 220 }
202 221
203 socket.current_x = ob->x; 222 socket.current_x = ob->x;
204 socket.current_y = ob->y; 223 socket.current_y = ob->y;
205
206 region *reg = ob->region ();
207 if (socket.current_region != reg)
208 {
209 socket.current_region = reg;
210 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
211 }
212} 224}
213 225
214/** 226/**
215 * RequestInfo is sort of a meta command. There is some specific 227 * RequestInfo is sort of a meta command. There is some specific
216 * request of information, but we call other functions to provide 228 * request of information, but we call other functions to provide
217 * that information. 229 * that information.
218 */ 230 */
219void 231void
220RequestInfo (char *buf, int len, client * ns) 232RequestInfo (char *buf, int len, client *ns)
221{ 233{
222 char *params = NULL, *cp; 234 char *params;
223
224 /* No match */
225 char bigbuf[MAX_BUF];
226 int slen;
227
228 /* Set up replyinfo before we modify any of the buffers - this is used
229 * if we don't find a match.
230 */
231 strcpy (bigbuf, "replyinfo ");
232 slen = strlen (bigbuf);
233 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
234 235
235 /* find the first space, make it null, and update the 236 /* find the first space, make it null, and update the
236 * params pointer. 237 * params pointer.
237 */ 238 */
238 for (cp = buf; *cp != '\0'; cp++) 239 for (params = buf; *params; params++)
239 if (*cp == ' ') 240 if (*params == ' ')
240 { 241 {
241 *cp = '\0';
242 params = cp + 1; 242 *params++ = 0;
243 break; 243 break;
244 } 244 }
245 245
246 if (!strcmp (buf, "image_info")) 246 if (!strcmp (buf, "image_info"))
247 send_image_info (ns, params); 247 send_image_info (ns, params);
… …
250 else if (!strcmp (buf, "skill_info")) 250 else if (!strcmp (buf, "skill_info"))
251 send_skill_info (ns, params); 251 send_skill_info (ns, params);
252 else if (!strcmp (buf, "spell_paths")) 252 else if (!strcmp (buf, "spell_paths"))
253 send_spell_paths (ns, params); 253 send_spell_paths (ns, params);
254 else 254 else
255 ns->send_packet (bigbuf, len); 255 {
256 // undo tokenisation above and send replyinfo with the request unchanged
257 if (*params)
258 *--params = ' ';
259
260 ns->send_packet_printf ("replyinfo %s", buf);
261 }
256} 262}
257 263
258void 264void
259ExtCmd (char *buf, int len, player *pl) 265ExtCmd (char *buf, int len, player *pl)
260{ 266{
… …
263 269
264void 270void
265ExtiCmd (char *buf, int len, client *ns) 271ExtiCmd (char *buf, int len, client *ns)
266{ 272{
267 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 273 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
274}
275
276void
277client::mapinfo_queue_clear ()
278{
279 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
280 free (*i);
281
282 mapinfo_queue.clear ();
283}
284
285bool
286client::mapinfo_try (char *buf)
287{
288 char *token = buf;
289 buf += strlen (buf) + 9;
290
291 // initial map and its origin
292 maptile *map = pl->observe->map;
293 int mapx = pl->ns->mapx / 2 - pl->observe->x;
294 int mapy = pl->ns->mapy / 2 - pl->observe->y;
295 int max_distance = 8; // limit maximum path length to something generous
296
297 while (*buf && map && max_distance)
298 {
299 int dir = *buf++ - '1';
300
301 if (dir >= 0 && dir <= 3)
302 {
303 if (!map->tile_path [dir])
304 map = 0;
305 else if (map->tile_available (dir, false))
306 {
307 maptile *neigh = map->tile_map [dir];
308
309 switch (dir)
310 {
311 case 0: mapy -= neigh->height; break;
312 case 2: mapy += map ->height; break;
313 case 3: mapx -= neigh->width ; break;
314 case 1: mapx += map ->width ; break;
315 }
316
317 map = neigh;
318 --max_distance;
319 }
320 else
321 return 0;
322 }
323 else
324 max_distance = 0;
325 }
326
327 if (!max_distance)
328 send_packet_printf ("mapinfo %s error", token);
329 else if (!map || !map->path)
330 send_packet_printf ("mapinfo %s nomap", token);
331 else
332 {
333 int flags = 0;
334
335 if (map->tile_path[0]) flags |= 1;
336 if (map->tile_path[1]) flags |= 2;
337 if (map->tile_path[2]) flags |= 4;
338 if (map->tile_path[3]) flags |= 8;
339
340 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
341 }
342
343 return 1;
344}
345
346void
347client::mapinfo_queue_run ()
348{
349 if (mapinfo_queue.empty () || !pl)
350 return;
351
352 for (int i = 0; i < mapinfo_queue.size (); ++i)
353 if (mapinfo_try (mapinfo_queue [i]))
354 {
355 free (mapinfo_queue [i]);
356 mapinfo_queue.erase (i);
357 }
358 else
359 ++i;
268} 360}
269 361
270void 362void
271MapInfoCmd (char *buf, int len, player *pl) 363MapInfoCmd (char *buf, int len, player *pl)
272{ 364{
273 // <mapinfo tag spatial tile-path 365 // <mapinfo tag spatial tile-path
274 // >mapinfo tag spatial flags x y w h hash 366 // >mapinfo tag spatial flags x y w h hash
275 367
276 char bigbuf[MAX_BUF], *token;
277
278 token = buf; 368 char *token = buf;
279 // copy token 369
280 if (!(buf = strchr (buf, ' '))) 370 if (!(buf = strchr (buf, ' ')))
281 return; 371 return;
282 372
283 *buf++ = 0;
284
285 if (!strncmp (buf, "spatial ", 8)) 373 if (!strncmp (buf, " spatial ", 9))
286 { 374 {
287 buf += 8; 375 char *copy = strdup (token);
376 copy [buf - token] = 0;
288 377
289 // initial map and its origin 378#if 0
290 maptile *map = pl->ob->map; 379 // this makes only sense when we flush the buffer immediately
291 sint16 dx, dy; 380 if (pl->ns->mapinfo_try (copy))
292 int mapx = pl->ns->mapx / 2 - pl->ob->x; 381 free (copy);
293 int mapy = pl->ns->mapy / 2 - pl->ob->y;
294 int max_distance = 8; // limit maximum path length to something generous
295
296 while (*buf && map && max_distance)
297 {
298 int dir = *buf++;
299
300 switch (dir)
301 {
302 case '1':
303 dx = 0;
304 dy = -1;
305 map = map->xy_find (dx, dy);
306 map && (mapy -= map->height);
307 break;
308 case '2':
309 mapx += map->width;
310 dx = map->width;
311 dy = 0;
312 map = map->xy_find (dx, dy);
313 break;
314 case '3':
315 mapy += map->height;
316 dx = 0;
317 dy = map->height;
318 map = map->xy_find (dx, dy);
319 break;
320 case '4':
321 dx = -1;
322 dy = 0;
323 map = map->xy_find (dx, dy);
324 map && (mapx -= map->width);
325 break;
326 }
327
328 --max_distance;
329 }
330
331 if (!max_distance)
332 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
333 else if (map && map->path[0])
334 {
335 int flags = 0;
336
337 if (map->tile_path[0])
338 flags |= 1;
339 if (map->tile_path[1])
340 flags |= 2;
341 if (map->tile_path[2])
342 flags |= 4;
343 if (map->tile_path[3])
344 flags |= 8;
345
346 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
347 }
348 else 382 else
349 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 383#endif
384 pl->ns->mapinfo_queue.push_back (copy);
350 } 385 }
351 else 386 else
352 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 387 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
353
354 pl->ns->send_packet (bigbuf);
355} 388}
356 389
357/** This is the Setup cmd - easy first implementation */ 390/** This is the Setup cmd */
358void 391void
359SetUp (char *buf, int len, client * ns) 392SetUp (char *buf, int len, client * ns)
360{ 393{
361 int s, slen; 394 INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
362 char *cmd, *param, cmdback[HUGE_BUF];
363
364 /* run through the cmds of setup
365 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
366 *
367 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
368 * The client then must sort this out
369 */
370
371 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
372
373 strcpy (cmdback, "setup");
374 for (s = 0; s < len; )
375 {
376 cmd = &buf[s];
377
378 /* find the next space, and put a null there */
379 for (; buf[s] && buf[s] != ' '; s++)
380 ;
381
382 buf[s++] = 0;
383
384 while (buf[s] == ' ')
385 s++;
386
387 if (s >= len)
388 break;
389
390 param = &buf[s];
391
392 for (; buf[s] && buf[s] != ' '; s++)
393 ;
394
395 buf[s++] = 0;
396
397 while (buf[s] == ' ')
398 s++;
399
400 slen = strlen (cmdback);
401 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
402 safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
403 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
404
405 if (!strcmp (cmd, "sound"))
406 {
407 ns->sound = atoi (param);
408 safe_strcat (cmdback, param, &slen, HUGE_BUF);
409 }
410 else if (!strcmp (cmd, "exp64"))
411 safe_strcat (cmdback, param, &slen, HUGE_BUF);
412 else if (!strcmp (cmd, "spellmon"))
413 {
414 ns->monitor_spells = atoi (param);
415 safe_strcat (cmdback, param, &slen, HUGE_BUF);
416 }
417 else if (!strcmp (cmd, "darkness"))
418 {
419 ns->darkness = atoi (param);
420 safe_strcat (cmdback, param, &slen, HUGE_BUF);
421 }
422 else if (!strcmp (cmd, "map1cmd"))
423 {
424 if (atoi (param))
425 ns->mapmode = Map1Cmd;
426 /* if beyond this size, need to use map1cmd no matter what */
427 if (ns->mapx > 11 || ns->mapy > 11)
428 ns->mapmode = Map1Cmd;
429 safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
430 }
431 else if (!strcmp (cmd, "map1acmd"))
432 {
433 if (atoi (param))
434 ns->mapmode = Map1aCmd;
435 /* if beyond this size, need to use map1acmd no matter what */
436 if (ns->mapx > 11 || ns->mapy > 11)
437 ns->mapmode = Map1aCmd;
438 safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
439 }
440 else if (!strcmp (cmd, "newmapcmd"))
441 {
442 ns->newmapcmd = atoi (param);
443 safe_strcat (cmdback, param, &slen, HUGE_BUF);
444 }
445 else if (!strcmp (cmd, "mapinfocmd"))
446 {
447 ns->mapinfocmd = atoi (param);
448 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
449 }
450 else if (!strcmp (cmd, "extcmd"))
451 {
452 ns->extcmd = atoi (param);
453 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
454 }
455 else if (!strcmp (cmd, "extmap"))
456 {
457 ns->extmap = atoi (param);
458 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
459 }
460 else if (!strcmp (cmd, "facecache"))
461 {
462 ns->facecache = atoi (param);
463 safe_strcat (cmdback, param, &slen, HUGE_BUF);
464 }
465 else if (!strcmp (cmd, "faceset"))
466 {
467 char tmpbuf[20];
468 int q = atoi (param);
469
470 if (is_valid_faceset (q))
471 ns->faceset = q;
472
473 sprintf (tmpbuf, "%d", ns->faceset);
474 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
475 /* if the client is using faceset, it knows about image2 command */
476 ns->image2 = 1;
477 }
478 else if (!strcmp (cmd, "itemcmd"))
479 {
480 /* Version of the item protocol command to use. Currently,
481 * only supported versions are 1 and 2. Using a numeric
482 * value will make it very easy to extend this in the future.
483 */
484 char tmpbuf[20];
485 int q = atoi (param);
486
487 if (q < 1 || q > 2)
488 {
489 strcpy (tmpbuf, "FALSE");
490 }
491 else
492 {
493 ns->itemcmd = q;
494 sprintf (tmpbuf, "%d", ns->itemcmd);
495 }
496 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
497 }
498 else if (!strcmp (cmd, "mapsize"))
499 {
500 int x, y = 0;
501 char tmpbuf[MAX_BUF], *cp;
502
503 x = atoi (param);
504 for (cp = param; *cp != 0; cp++)
505 if (*cp == 'x' || *cp == 'X')
506 {
507 y = atoi (cp + 1);
508 break;
509 }
510
511 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
512 {
513 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
514 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
515 }
516 else
517 {
518 ns->mapx = x;
519 ns->mapy = y;
520 /* better to send back what we are really using and not the
521 * param as given to us in case it gets parsed differently.
522 */
523 sprintf (tmpbuf, "%dx%d", x, y);
524 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
525 /* If beyond this size and still using orig map command, need to
526 * go to map1cmd.
527 */
528 if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
529 ns->mapmode = Map1Cmd;
530 }
531 }
532 else if (!strcmp (cmd, "extendedMapInfos"))
533 {
534 /* Added by tchize
535 * prepare to use the mapextended command
536 */
537 char tmpbuf[20];
538
539 ns->ext_mapinfos = (atoi (param));
540 sprintf (tmpbuf, "%d", ns->ext_mapinfos);
541 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
542 }
543 else if (!strcmp (cmd, "extendedTextInfos"))
544 {
545 /* Added by tchize
546 * prepare to use the extended text commands
547 * Client toggle this to non zero to get exttext
548 */
549 char tmpbuf[20];
550
551 ns->has_readable_type = (atoi (param));
552 sprintf (tmpbuf, "%d", ns->has_readable_type);
553 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
554 }
555 else
556 {
557 /* Didn't get a setup command we understood -
558 * report a failure to the client.
559 */
560 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
561 }
562 } /* for processing all the setup commands */
563
564 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
565 ns->send_packet (cmdback);
566} 395}
567 396
568/** 397/**
569 * The client has requested to be added to the game. 398 * The client has requested to be added to the game.
570 * This is what takes care of it. We tell the client how things worked out. 399 * This is what takes care of it. We tell the client how things worked out.
… …
572 * it either has to be here or init_sockets needs to be exported. 401 * it either has to be here or init_sockets needs to be exported.
573 */ 402 */
574void 403void
575AddMeCmd (char *buf, int len, client *ns) 404AddMeCmd (char *buf, int len, client *ns)
576{ 405{
577 // face caching is mandatory
578 if (!ns->facecache)
579 {
580 ns->send_drawinfo (
581 "\n"
582 "\n"
583 "***\n"
584 "*** WARNING:\n"
585 "*** Your client does not support face/image caching,\n"
586 "*** or it has been disabled. Face caching is mandatory\n"
587 "*** so please enable it or use a newer client.\n"
588 "***\n"
589 "*** Look at your client preferences:\n"
590 "***\n"
591 "*** CFPlus: all known versions automatically enable the facecache.\n"
592 "*** cfclient: use the -cache commandline option.\n"
593 "*** cfclient: map will not redraw automatically (bug).\n"
594 "*** gcfclient: use -cache commandline option, or enable\n"
595 "*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.\n"
596 "*** jcrossclient: your client is broken, use CFPlus or gcfclient.\n"
597 "***\n"
598 "***\n",
599 NDI_RED
600 );
601
602 if (strstr (ns->version, "jcrossclient"))
603 /* let them, for now*/;
604 else
605 {
606 ns->flush ();
607 //ns->destroy ();
608 }
609 //ns->facecache = true;
610 }
611
612 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 406 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
613} 407}
614 408
615/** Reply to ExtendedInfos command */ 409/** Reply to ExtendedInfos command */
616void 410void
… …
727 521
728 ns->send_packet (cmdback); 522 ns->send_packet (cmdback);
729} 523}
730 524
731/** 525/**
732 * client requested an image. send it rate-limited
733 * before flushing.
734 */
735void
736AskFaceCmd (char *buf, int len, client *ns)
737{
738 ns->askface.push_back (atoi (buf));
739}
740
741/**
742 * Tells client the picture it has to use
743 * to smooth a picture number given as argument.
744 */
745void
746AskSmooth (char *buf, int len, client *ns)
747{
748 ns->send_face (atoi (buf));
749}
750
751/**
752 * This handles the general commands from the client (ie, north, fire, cast, 526 * This handles the general commands from the client (ie, north, fire, cast,
753 * etc.) 527 * etc.)
754 */ 528 */
755void 529void
756PlayerCmd (char *buf, int len, player *pl) 530PlayerCmd (char *buf, int len, player *pl)
… …
777 * commands. 551 * commands.
778 */ 552 */
779 pl->count = 0; 553 pl->count = 0;
780} 554}
781 555
782
783/** 556/**
784 * This handles the general commands from the client (ie, north, fire, cast, 557 * This handles the general commands from the client (ie, north, fire, cast,
785 * etc.). It is a lot like PlayerCmd above, but is called with the 558 * etc.). It is a lot like PlayerCmd above, but is called with the
786 * 'ncom' method which gives more information back to the client so it 559 * 'ncom' method which gives more information back to the client so it
787 * can throttle. 560 * can throttle.
… …
789void 562void
790NewPlayerCmd (char *buf, int len, player *pl) 563NewPlayerCmd (char *buf, int len, player *pl)
791{ 564{
792 if (len <= 6) 565 if (len <= 6)
793 { 566 {
794 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 567 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
795 return; 568 return;
796 } 569 }
797 570
798 uint16 cmdid = net_uint16 ((uint8 *)buf); 571 uint16 cmdid = net_uint16 ((uint8 *)buf);
799 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 572 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
856 { 629 {
857 case ST_PLAYING: 630 case ST_PLAYING:
858 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 631 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
859 break; 632 break;
860 633
861 case ST_CHANGE_CLASS:
862 key_change_class (pl->ob, buf[0]);
863 break;
864
865 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 634 case ST_GET_PARTY_PASSWORD: /* Get password for party */
866 receive_party_password (pl->ob, 13); 635 receive_party_password (pl->ob, 13);
867 break; 636 break;
868 637
869 default: 638 default:
… …
908 677
909 cp = strchr (cp + 1, ' '); 678 cp = strchr (cp + 1, ' ');
910 679
911 if (cp) 680 if (cp)
912 { 681 {
913 assign (ns->version, cp + 1); 682 ns->version = cp + 1;
914 683
915 if (ns->sc_version < 1026) 684 if (ns->sc_version < 1026)
916 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 685 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
917 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 686 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
918 } 687 }
… …
941 * syntax is: move (to) (tag) (nrof) 710 * syntax is: move (to) (tag) (nrof)
942 */ 711 */
943void 712void
944MoveCmd (char *buf, int len, player *pl) 713MoveCmd (char *buf, int len, player *pl)
945{ 714{
946 int vals[3], i; 715 int to, tag, nrof;
947 716
948 /* A little funky here. We only cycle for 2 records, because 717 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
949 * we obviously are not going to find a space after the third
950 * record. Perhaps we should just replace this with a
951 * sscanf?
952 */
953 for (i = 0; i < 2; i++)
954 { 718 {
955 vals[i] = atoi (buf);
956
957 if (!(buf = strchr (buf, ' ')))
958 {
959 LOG (llevError, "Incomplete move command: %s\n", buf); 719 LOG (llevError, "Incomplete move command: %s\n", buf);
960 return; 720 return;
961 }
962
963 buf++;
964 } 721 }
965 722
966 vals[2] = atoi (buf); 723 esrv_move_object (pl->ob, to, tag, nrof);
967
968/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
969 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
970} 724}
971 725
972/****************************************************************************** 726/******************************************************************************
973 * 727 *
974 * Start of commands the server sends to the client. 728 * Start of commands the server sends to the client.
… …
978/** 732/**
979 * Asks the client to query the user. This way, the client knows 733 * Asks the client to query the user. This way, the client knows
980 * it needs to send something back (vs just printing out a message) 734 * it needs to send something back (vs just printing out a message)
981 */ 735 */
982void 736void
983send_query (client *ns, uint8 flags, char *text) 737send_query (client *ns, uint8 flags, const char *text)
984{ 738{
985 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 739 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
740}
741
742/**
743 * Get player's current range attack in obuf.
744 */
745static void
746rangetostring (player *pl, char *obuf)
747{
748 dynbuf_text buf;
749
750 if (pl->ranged_ob)
751 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
752
753 if (pl->combat_ob)
754 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
755
756#if 0
757 //TODO: remove this when slot system is working, this is only for debugging
758 if (pl->ob->chosen_skill)
759 buf << " Skill*: " << pl->ob->chosen_skill->name;
760#endif
761
762 //TODO: maybe golem should become the current_weapon, quite simply?
763 if (pl->golem)
764 buf << " Golem*: " << pl->golem->name;
765
766 buf << '\0';
767 buf.linearise (obuf);
986} 768}
987 769
988#define AddIfInt64(Old,New,Type) if (Old != New) {\ 770#define AddIfInt64(Old,New,Type) if (Old != New) {\
989 Old = New; \ 771 Old = New; \
990 sl << uint8 (Type) << uint64 (New); \ 772 sl << uint8 (Type) << uint64 (New); \
… …
998#define AddIfShort(Old,New,Type) if (Old != New) {\ 780#define AddIfShort(Old,New,Type) if (Old != New) {\
999 Old = New; \ 781 Old = New; \
1000 sl << uint8 (Type) << uint16 (New); \ 782 sl << uint8 (Type) << uint16 (New); \
1001 } 783 }
1002 784
1003#define AddIfFloat(Old,New,Type) if (Old != New) {\ 785#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
1004 Old = New; \ 786 Old = New; \
1005 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 787 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
1006 } 788 }
1007 789
1008#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 790#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1009 free(Old); Old = strdup (New);\ 791 free(Old); Old = strdup (New);\
1010 sl << uint8 (Type) << data8 (New); \ 792 sl << uint8 (Type) << data8 (New); \
… …
1024 806
1025 client *ns = pl->ns; 807 client *ns = pl->ns;
1026 if (!ns) 808 if (!ns)
1027 return; 809 return;
1028 810
1029 object *ob = pl->ob; 811 object *ob = pl->observe;
1030 if (!ob) 812 if (!ob)
1031 return; 813 return;
814
815 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
1032 816
1033 packet sl ("stats"); 817 packet sl ("stats");
1034 818
1035 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 819 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1036 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 820 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
1045 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 829 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1046 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 830 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1047 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 831 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1048 832
1049 for (int s = 0; s < NUM_SKILLS; s++) 833 for (int s = 0; s < NUM_SKILLS; s++)
1050 if (object *skill = pl->last_skill_ob[s]) 834 if (object *skill = opl->last_skill_ob [s])
1051 if (skill->stats.exp != ns->last_skill_exp [s]) 835 if (skill->stats.exp != ns->last_skill_exp [s])
1052 { 836 {
1053 ns->last_skill_exp [s] = skill->stats.exp; 837 ns->last_skill_exp [s] = skill->stats.exp;
1054 838
1055 /* Always send along the level if exp changes. This is only 839 /* Always send along the level if exp changes. This is only
… …
1063 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 847 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1064 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 848 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1065 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 849 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1066 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 850 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1067 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 851 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1068 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 852 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1069 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 853 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1070 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 854 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
1071 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 855 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1072 856
1073 flags = 0; 857 flags = 0;
1074 858
1075 if (pl->fire_on) 859 if (opl->fire_on)
1076 flags |= SF_FIREON; 860 flags |= SF_FIREON;
1077 861
1078 if (pl->run_on) 862 if (opl->run_on)
1079 flags |= SF_RUNON; 863 flags |= SF_RUNON;
1080 864
1081 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 865 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1082 866
1083 if (ns->sc_version < 1025) 867 if (ns->sc_version < 1025)
… …
1097 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 881 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1098 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 882 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1099 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 883 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1100 } 884 }
1101 885
1102 rangetostring (ob, buf); /* we want use the new fire & run system in new client */ 886 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
1103 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 887 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1104 set_title (ob, buf); 888 set_title (ob, buf);
1105 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 889 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1106 890
1107 /* Only send it away if we have some actual data */ 891 /* Only send it away if we have some actual data */
… …
1111 895
1112/** 896/**
1113 * Tells the client that here is a player it should start using. 897 * Tells the client that here is a player it should start using.
1114 */ 898 */
1115void 899void
1116esrv_new_player (player *pl, uint32 weight) 900esrv_new_player (player *pl)
1117{ 901{
902 sint32 weight = pl->ob->client_weight ();
903
1118 packet sl ("player"); 904 packet sl ("player");
1119 905
1120 sl << uint32 (pl->ob->count) 906 sl << uint32 (pl->ob->count)
1121 << uint32 (weight) 907 << uint32 (weight)
1122 << uint32 (pl->ob->face) 908 << uint32 (pl->ob->face)
1123 << data8 (pl->ob->name); 909 << data8 (pl->ob->name);
1124 910
1125 pl->ns->last_weight = weight; 911 pl->ns->last_weight = weight;
1126 pl->ns->send_packet (sl); 912 pl->ns->send_packet (sl);
1127 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1128} 913}
1129 914
1130/****************************************************************************** 915/******************************************************************************
1131 * 916 *
1132 * Start of map related commands. 917 * Start of map related commands.
… …
1189 974
1190 if (!ns.faces_sent[face_num]) 975 if (!ns.faces_sent[face_num])
1191 if (ob) 976 if (ob)
1192 ns.send_faces (ob); 977 ns.send_faces (ob);
1193 else 978 else
1194 ns.send_face (face_num); 979 ns.send_face (face_num, 10);
1195 980
1196 sl << uint16 (face_num); 981 sl << uint16 (face_num);
1197 return 1; 982 return 1;
1198 } 983 }
1199 984
… …
1241{ 1026{
1242 prefetch_surrounding_maps (op->map, 3); 1027 prefetch_surrounding_maps (op->map, 3);
1243} 1028}
1244 1029
1245/** 1030/**
1246 * This function uses the new map1 protocol command to send the map 1031 * Draws client map.
1247 * to the client. It is necessary because the old map command supports
1248 * a maximum map size of 15x15.
1249 * This function is much simpler than the old one. This is because
1250 * the old function optimized to send as few face identifiers as possible,
1251 * at the expense of sending more coordinate location (coordinates were
1252 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1253 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1254 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1255 * and use the other 4 bits for other informatiion. For full documentation
1256 * of what we send, see the doc/Protocol file.
1257 * I will describe internally what we do:
1258 * the ns->lastmap shows how the map last looked when sent to the client.
1259 * in the lastmap structure, there is a cells array, which is set to the
1260 * maximum viewable size (As set in config.h).
1261 * in the cells, there are faces and a count value.
1262 * we use the count value to hold the darkness value. If -1, then this space
1263 * is not viewable.
1264 * we use faces[0] faces[1] faces[2] to hold what the three layers
1265 * look like.
1266 */ 1032 */
1267void 1033void
1268draw_client_map1 (object *pl) 1034draw_client_map (player *pl)
1269{ 1035{
1270 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1036 object *ob = pl->observe;
1271 sint16 nx, ny; 1037 if (!ob->active)
1038 return;
1039
1040 /* If player is just joining the game, he isn't here yet, so the map
1041 * can get swapped out. If so, don't try to send them a map. All will
1042 * be OK once they really log in.
1043 */
1044 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1045 return;
1046
1047 int startlen, oldlen;
1272 int estartlen, eoldlen; 1048 int estartlen, eoldlen;
1273 uint8 eentrysize; 1049 uint8 eentrysize;
1274 uint16 ewhatstart, ewhatflag; 1050 uint16 ewhatstart, ewhatflag;
1275 uint8 extendedinfos; 1051 uint8 extendedinfos;
1276 maptile *m;
1277 1052
1278 client &socket = *pl->contr->ns;
1279
1280 if (!pl->active)
1281 return;
1282
1283 check_map_change (pl->contr); 1053 check_map_change (pl);
1284 prefetch_surrounding_maps (pl); 1054 prefetch_surrounding_maps (pl->ob);
1055
1056 /* do LOS after calls to update_position */
1057 /* unfortunately, we need to udpate los when observing, currently */
1058 if (pl->do_los || pl->observe != pl->ob)
1059 {
1060 pl->do_los = 0;
1061 pl->update_los ();
1062 }
1063
1064 /**
1065 * This function uses the new map1 protocol command to send the map
1066 * to the client. It is necessary because the old map command supports
1067 * a maximum map size of 15x15.
1068 * This function is much simpler than the old one. This is because
1069 * the old function optimized to send as few face identifiers as possible,
1070 * at the expense of sending more coordinate location (coordinates were
1071 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1072 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1073 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1074 * and use the other 4 bits for other informatiion. For full documentation
1075 * of what we send, see the doc/Protocol file.
1076 * I will describe internally what we do:
1077 * the ns->lastmap shows how the map last looked when sent to the client.
1078 * in the lastmap structure, there is a cells array, which is set to the
1079 * maximum viewable size (As set in config.h).
1080 * in the cells, there are faces and a count value.
1081 * we use the count value to hold the darkness value. If -1, then this space
1082 * is not viewable.
1083 * we use faces[0] faces[1] faces[2] to hold what the three layers
1084 * look like.
1085 */
1086
1087 client &socket = *pl->ns;
1285 1088
1286 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1089 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1287 packet esl; 1090 packet esl;
1288 1091
1289 startlen = sl.length (); 1092 startlen = sl.length ();
… …
1305 << uint8 (eentrysize); 1108 << uint8 (eentrysize);
1306 1109
1307 estartlen = esl.length (); 1110 estartlen = esl.length ();
1308 } 1111 }
1309 1112
1310 /* x,y are the real map locations. ax, ay are viewport relative
1311 * locations.
1312 */
1313 ay = 0;
1314
1315 /* We could do this logic as conditionals in the if statement, 1113 /* We could do this logic as conditionals in the if statement,
1316 * but that started to get a bit messy to look at. 1114 * but that started to get a bit messy to look at.
1317 */ 1115 */
1318 max_x = pl->x + (socket.mapx + 1) / 2; 1116 int hx = socket.mapx / 2;
1319 max_y = pl->y + (socket.mapy + 1) / 2; 1117 int hy = socket.mapy / 2;
1320 1118
1321 maptile *plmap = pl->map; 1119 for (int dx = -hx; dx <= hx; dx++)
1322
1323 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1324 { 1120 {
1325 ax = 0; 1121 sint16 nx, ny;
1326 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1122 maptile *m = 0;
1123
1124 for (int dy = -hy; dy <= hy; dy++)
1327 { 1125 {
1126 // check to see if we can simply go one down quickly
1127 if (m && ++ny >= m->height)
1128 m = 0;
1129
1130 // no, so do it the slow way
1131 if (!m)
1132 {
1133 nx = ob->x + dx; ny = ob->y + dy; m = ob->map;
1134
1135 if (xy_normalise (m, nx, ny))
1136 m->touch ();
1137 else
1138 m = 0;
1139 }
1140
1141 int ax = dx + hx;
1142 int ay = dy + hy;
1143
1328 int emask, mask; 1144 int emask, mask;
1329 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1145 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1330 1146
1331 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1147 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1332 1148
1333 /* If the coordinates are not valid, or it is too dark to see, 1149 /* If the coordinates are not valid, or it is too dark to see,
1334 * we tell the client as such 1150 * we tell the client as such
1335 */ 1151 */
1336 nx = x;
1337 ny = y;
1338 m = get_map_from_coord (plmap, &nx, &ny);
1339
1340 if (!m) 1152 if (!m)
1341 { 1153 {
1342 /* space is out of map. Update space and clear values 1154 /* space is out of map. Update space and clear values
1343 * if this hasn't already been done. If the space is out 1155 * if this hasn't already been done. If the space is out
1344 * of the map, it shouldn't have a head 1156 * of the map, it shouldn't have a head.
1345 */ 1157 */
1346 if (lastcell.count != -1) 1158 if (lastcell.count != -1)
1347 { 1159 {
1348 sl << uint16 (mask); 1160 sl << uint16 (mask);
1349 map_clearcell (&lastcell, -1); 1161 map_clearcell (&lastcell, -1);
1350 } 1162 }
1351 1163
1352 continue; 1164 continue;
1353 } 1165 }
1354 1166
1355 m->touch ();
1356
1357 int d = pl->contr->blocked_los[ax][ay]; 1167 int d = pl->blocked_los_uc (dx, dy);
1358 1168
1359 if (d > 3) 1169 if (d > 3)
1360 { 1170 {
1361
1362 int need_send = 0, count; 1171 int need_send = 0, count;
1363 1172
1364 /* This block deals with spaces that are not visible for whatever 1173 /* This block deals with spaces that are not visible for whatever
1365 * reason. Still may need to send the head for this space. 1174 * reason. Still may need to send the head for this space.
1366 */ 1175 */
… …
1372 if (lastcell.count != -1) 1181 if (lastcell.count != -1)
1373 need_send = 1; 1182 need_send = 1;
1374 1183
1375 count = -1; 1184 count = -1;
1376 1185
1377 /* properly clear a previously sent big face */
1378 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2] 1186 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1379 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1187 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1380 need_send = 1; 1188 need_send = 1;
1381 1189
1190 /* properly clear a previously sent big face */
1382 map_clearcell (&lastcell, count); 1191 map_clearcell (&lastcell, count);
1383 1192
1384 if ((mask & 0xf) || need_send) 1193 if ((mask & 0xf) || need_send)
1385 sl[oldlen + 1] = mask & 0xff; 1194 sl[oldlen + 1] = mask & 0xff;
1386 else 1195 else
… …
1425 } 1234 }
1426 1235
1427 lastcell.count = d; 1236 lastcell.count = d;
1428 1237
1429 mapspace &ms = m->at (nx, ny); 1238 mapspace &ms = m->at (nx, ny);
1239 ms.update ();
1430 1240
1431 if (socket.extmap) 1241 if (socket.extmap)
1432 { 1242 {
1433 uint8 stat_hp = 0; 1243 uint8 stat_hp = 0;
1434 uint8 stat_width = 0; 1244 uint8 stat_width = 0;
1435 uint8 flags = 0; 1245 uint8 flags = 0;
1436 UUID player = 0; 1246 tag_t player = 0;
1437 1247
1438 // send hp information, if applicable 1248 // send hp information, if applicable
1439 if (object *op = ms.faces_obj [0]) 1249 if (object *op = ms.faces_obj [0])
1440 {
1441 if (op->head || op->invisible) 1250 if (op->is_head () && !op->invisible)
1442 ; // do not show
1443 else if (op->type == PLAYER
1444 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1445 { 1251 {
1446 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) 1252 if (op->stats.maxhp > op->stats.hp
1253 && op->stats.maxhp > 0
1254 && (op->type == PLAYER
1255 || op->type == DOOR // does not work, have maxhp 0
1256 || QUERY_FLAG (op, FLAG_MONSTER)
1257 || QUERY_FLAG (op, FLAG_ALIVE)
1258 || QUERY_FLAG (op, FLAG_GENERATOR)))
1447 { 1259 {
1448 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1260 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1449 stat_width = op->arch->tail_x; 1261 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1450 } 1262 }
1451 }
1452 1263
1453 if (op->msg && op->msg[0] == '@') 1264 if (op->has_dialogue ())
1454 flags |= 1; 1265 flags |= 1;
1455 1266
1456 if (op->type == PLAYER && op != pl) 1267 if (op->type == PLAYER)
1457 player = op->count; 1268 player = op == ob ? pl->ob->count
1269 : op == pl->ob ? ob->count
1270 : op->count;
1458 } 1271 }
1459 1272
1460 if (lastcell.stat_hp != stat_hp) 1273 if (lastcell.stat_hp != stat_hp)
1461 { 1274 {
1462 lastcell.stat_hp = stat_hp; 1275 lastcell.stat_hp = stat_hp;
1463 1276
… …
1482 1295
1483 mask |= 0x8; 1296 mask |= 0x8;
1484 *last_ext |= 0x80; 1297 *last_ext |= 0x80;
1485 last_ext = &sl[sl.length ()]; 1298 last_ext = &sl[sl.length ()];
1486 1299
1487 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1300 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1488 } 1301 }
1489 1302
1490 if (lastcell.flags != flags) 1303 if (lastcell.flags != flags)
1491 { 1304 {
1492 lastcell.flags = flags; 1305 lastcell.flags = flags;
… …
1505 1318
1506 /* Middle face */ 1319 /* Middle face */
1507 if (update_space (sl, socket, ms, lastcell, 1)) 1320 if (update_space (sl, socket, ms, lastcell, 1))
1508 mask |= 0x2; 1321 mask |= 0x2;
1509 1322
1510 if (ms.player () == pl 1323 if (ob->invisible
1511 && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) 1324 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1325 && ms.player () == ob)
1512 { 1326 {
1513 // force player to be visible to himself if invisible 1327 // force player to be visible to himself if invisible
1514 if (lastcell.faces[0] != pl->face) 1328 if (lastcell.faces[0] != ob->face)
1515 { 1329 {
1516 lastcell.faces[0] = pl->face; 1330 lastcell.faces[0] = ob->face;
1517 1331
1518 mask |= 0x1; 1332 mask |= 0x1;
1519 sl << uint16 (pl->face); 1333 sl << uint16 (ob->face);
1520 1334
1521 socket.send_faces (pl); 1335 socket.send_faces (ob);
1522 } 1336 }
1523 } 1337 }
1524 /* Top face */ 1338 /* Top face */
1525 else if (update_space (sl, socket, ms, lastcell, 0)) 1339 else if (update_space (sl, socket, ms, lastcell, 0))
1526 mask |= 0x1; 1340 mask |= 0x1;
1527
1528 1341
1529 /* Check to see if we are in fact sending anything for this 1342 /* Check to see if we are in fact sending anything for this
1530 * space by checking the mask. If so, update the mask. 1343 * space by checking the mask. If so, update the mask.
1531 * if not, reset the len to that from before adding the mask 1344 * if not, reset the len to that from before adding the mask
1532 * value, so we don't send those bits. 1345 * value, so we don't send those bits.
… …
1566 } 1379 }
1567 } /* else this is a viewable space */ 1380 } /* else this is a viewable space */
1568 } /* for x loop */ 1381 } /* for x loop */
1569 } /* for y loop */ 1382 } /* for y loop */
1570 1383
1384 socket.flush_fx ();
1385
1571 /* Verify that we in fact do need to send this */ 1386 /* Verify that we in fact do need to send this */
1572 if (socket.ext_mapinfos) 1387 if (socket.ext_mapinfos)
1573 { 1388 {
1574 if (!(sl.length () > startlen || socket.sent_scroll)) 1389 if (!(sl.length () > startlen || socket.sent_scroll))
1575 { 1390 {
… …
1589 socket.send_packet (sl); 1404 socket.send_packet (sl);
1590 socket.sent_scroll = 0; 1405 socket.sent_scroll = 0;
1591 } 1406 }
1592} 1407}
1593 1408
1594/**
1595 * Draws client map.
1596 */
1597void
1598draw_client_map (object *pl)
1599{
1600 int i, j;
1601 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1602 int mflags;
1603 struct Map newmap;
1604 maptile *m, *pm;
1605
1606 if (pl->type != PLAYER)
1607 {
1608 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1609 return;
1610 }
1611
1612 pm = pl->map;
1613
1614 /* If player is just joining the game, he isn't here yet, so the map
1615 * can get swapped out. If so, don't try to send them a map. All will
1616 * be OK once they really log in.
1617 */
1618 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1619 return;
1620
1621 memset (&newmap, 0, sizeof (struct Map));
1622
1623 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1624 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1625 {
1626 ax = i;
1627 ay = j;
1628 m = pm;
1629 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1630
1631 if (mflags & P_OUT_OF_MAP)
1632 continue;
1633
1634 /* If a map is visible to the player, we don't want to swap it out
1635 * just to reload it. This should really call something like
1636 * swap_map, but this is much more efficient and 'good enough'
1637 */
1638 if (mflags & P_NEW_MAP)
1639 m->timeout = 50;
1640 }
1641
1642 /* do LOS after calls to update_position */
1643 if (pl->contr->do_los)
1644 {
1645 update_los (pl);
1646 pl->contr->do_los = 0;
1647 }
1648
1649 /* Big maps need a different drawing mechanism to work */
1650 draw_client_map1 (pl);
1651}
1652
1653
1654/*****************************************************************************/ 1409/*****************************************************************************/
1655
1656/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 1410/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1657
1658/* a player. Of course, the client need to know the command to be able to */ 1411/* a player. Of course, the client need to know the command to be able to */
1659
1660/* manage it ! */ 1412/* manage it ! */
1661
1662/*****************************************************************************/ 1413/*****************************************************************************/
1663void 1414void
1664send_plugin_custom_message (object *pl, char *buf) 1415send_plugin_custom_message (object *pl, char *buf)
1665{ 1416{
1666 pl->contr->ns->send_packet (buf); 1417 pl->contr->ns->send_packet (buf);
… …
1675{ 1426{
1676 packet sl; 1427 packet sl;
1677 sl << "replyinfo skill_info\n"; 1428 sl << "replyinfo skill_info\n";
1678 1429
1679 for (int i = 1; i < NUM_SKILLS; i++) 1430 for (int i = 1; i < NUM_SKILLS; i++)
1680 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1431 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1681 1432
1682 if (sl.length () >= MAXSOCKBUF) 1433 if (sl.length () > MAXSOCKBUF)
1683 { 1434 {
1684 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1435 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1685 fatal (0); 1436 fatal (0);
1686 } 1437 }
1687 1438
… …
1700 sl << "replyinfo spell_paths\n"; 1451 sl << "replyinfo spell_paths\n";
1701 1452
1702 for (int i = 0; i < NRSPELLPATHS; i++) 1453 for (int i = 0; i < NRSPELLPATHS; i++)
1703 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1454 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1704 1455
1705 if (sl.length () >= MAXSOCKBUF) 1456 if (sl.length () > MAXSOCKBUF)
1706 { 1457 {
1707 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1458 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1708 fatal (0); 1459 fatal (0);
1709 } 1460 }
1710 1461
… …
1729 if (spell->type == SPELL) 1480 if (spell->type == SPELL)
1730 { 1481 {
1731 int flags = 0; 1482 int flags = 0;
1732 1483
1733 /* check if we need to update it */ 1484 /* check if we need to update it */
1734 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1485 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1735 { 1486 {
1736 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1487 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1737 flags |= UPD_SP_MANA; 1488 flags |= UPD_SP_MANA;
1738 } 1489 }
1739 1490
1740 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1491 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1741 { 1492 {
1742 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1493 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1743 flags |= UPD_SP_GRACE; 1494 flags |= UPD_SP_GRACE;
1744 } 1495 }
1745 1496
1746 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1497 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1747 { 1498 {
1748 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1499 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1749 flags |= UPD_SP_DAMAGE; 1500 flags |= UPD_SP_DAMAGE;
1750 } 1501 }
1751 1502
1752 if (flags) 1503 if (flags)
1753 { 1504 {
… …
1755 1506
1756 sl << "updspell " 1507 sl << "updspell "
1757 << uint8 (flags) 1508 << uint8 (flags)
1758 << uint32 (spell->count); 1509 << uint32 (spell->count);
1759 1510
1760 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1511 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1761 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1512 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1762 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1513 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1763 1514
1764 pl->ns->send_packet (sl); 1515 pl->ns->send_packet (sl);
1765 } 1516 }
1766 } 1517 }
1767 } 1518 }
… …
1797 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1548 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1798 return; 1549 return;
1799 } 1550 }
1800 1551
1801 /* store costs and damage in the object struct, to compare to later */ 1552 /* store costs and damage in the object struct, to compare to later */
1802 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1553 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1803 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1554 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1804 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1555 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1805 1556
1806 /* figure out which skill it uses, if it uses one */ 1557 /* figure out which skill it uses, if it uses one */
1807 if (spell->skill) 1558 if (spell->skill)
1808 { 1559 if (object *tmp = pl->find_skill (spell->skill))
1809 for (i = 1; i < NUM_SKILLS; i++)
1810 if (!strcmp (spell->skill, skill_names[i]))
1811 {
1812 skill = i + CS_STAT_SKILLINFO; 1560 skill = tmp->subtype + CS_STAT_SKILLINFO;
1813 break;
1814 }
1815 }
1816 1561
1817 // spells better have a face 1562 // spells better have a face
1818 if (!spell->face) 1563 if (!spell->face)
1819 { 1564 {
1820 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1565 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1821 spell->face = face_find ("burnout.x11", blank_face); 1566 spell->face = face_find ("burnout.x11", blank_face);
1822 } 1567 }
1568
1569 pl->ns->send_face (spell->face);
1823 1570
1824 /* send the current values */ 1571 /* send the current values */
1825 sl << uint32 (spell->count) 1572 sl << uint32 (spell->count)
1826 << uint16 (spell->level) 1573 << uint16 (spell->level)
1827 << uint16 (spell->casting_time) 1574 << uint16 (spell->casting_time)
1828 << uint16 (spell->last_sp) 1575 << uint16 (spell->cached_sp)
1829 << uint16 (spell->last_grace) 1576 << uint16 (spell->cached_grace)
1830 << uint16 (spell->last_eat) 1577 << uint16 (spell->cached_eat)
1831 << uint8 (skill) 1578 << uint8 (skill)
1832 << uint32 (spell->path_attuned) 1579 << uint32 (spell->path_attuned)
1833 << uint32 (spell->face) 1580 << uint32 (spell->face)
1834 << data8 (spell->name) 1581 << data8 (spell->name)
1835 << data16 (spell->msg); 1582 << data16 (spell->msg);
… …
1863 * bytes and 3 strings (because that is the spec) so we need to 1610 * bytes and 3 strings (because that is the spec) so we need to
1864 * check that the length of those 3 strings, plus the 23 bytes, 1611 * check that the length of those 3 strings, plus the 23 bytes,
1865 * won't take us over the length limit for the socket, if it does, 1612 * won't take us over the length limit for the socket, if it does,
1866 * we need to send what we already have, and restart packet formation 1613 * we need to send what we already have, and restart packet formation
1867 */ 1614 */
1615 if (spell->type != SPELL)
1616 continue;
1617
1868 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1618 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1869 * to show add_spell is 26 bytes + 2 strings. However, the overun 1619 * to show add_spell is 26 bytes + 2 strings. However, the overun
1870 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1620 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1871 * like it will fix this 1621 * like it will fix this
1872 */ 1622 */
1873 if (spell->type != SPELL)
1874 continue;
1875
1876 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1623 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1877 { 1624 {
1625 pl->ns->flush_fx ();
1878 pl->ns->send_packet (sl); 1626 pl->ns->send_packet (sl);
1879 1627
1880 sl.reset (); 1628 sl.reset ();
1881 sl << "addspell "; 1629 sl << "addspell ";
1882 } 1630 }
… …
1890 return; 1638 return;
1891 } 1639 }
1892 else 1640 else
1893 append_spell (pl, sl, spell); 1641 append_spell (pl, sl, spell);
1894 1642
1895 if (sl.length () >= MAXSOCKBUF) 1643 if (sl.length () > MAXSOCKBUF)
1896 { 1644 {
1897 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1645 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1898 fatal (0); 1646 fatal (0);
1899 } 1647 }
1900 1648
1901 /* finally, we can send the packet */ 1649 /* finally, we can send the packet */
1650 pl->ns->flush_fx ();
1902 pl->ns->send_packet (sl); 1651 pl->ns->send_packet (sl);
1903} 1652}
1904 1653

Diff Legend

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