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.75 by root, Wed Mar 14 04:12:29 2007 UTC vs.
Revision 1.133 by root, Sun Jul 13 11:57:25 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.
… …
130} 129}
131 130
132static void 131static void
133clear_map (player *pl) 132clear_map (player *pl)
134{ 133{
134 pl->ns->mapinfo_queue_clear ();
135
135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 136 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
137
138 pl->ns->force_newmap = false;
136 139
137 if (pl->ns->newmapcmd == 1) 140 if (pl->ns->newmapcmd == 1)
138 pl->ns->send_packet ("newmap"); 141 pl->ns->send_packet ("newmap");
139 142
140 pl->ns->floorbox_reset (); 143 pl->ns->floorbox_reset ();
144}
145
146static void
147send_map_info (player *pl)
148{
149 client &socket = *pl->ns;
150 object *ob = pl->observe;
151
152 if (socket.mapinfocmd)
153 {
154 if (ob->map && ob->map->path[0])
155 {
156 int flags = 0;
157
158 if (ob->map->tile_path[0]) flags |= 1;
159 if (ob->map->tile_path[1]) flags |= 2;
160 if (ob->map->tile_path[2]) flags |= 4;
161 if (ob->map->tile_path[3]) flags |= 8;
162
163 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
164 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
165 ob->map->width, ob->map->height, &ob->map->path);
166 }
167 else
168 socket.send_packet ("mapinfo current");
169 }
141} 170}
142 171
143/** check for map/region change and send new map data */ 172/** check for map/region change and send new map data */
144static void 173static void
145check_map_change (player *pl) 174check_map_change (player *pl)
146{ 175{
147 client &socket = *pl->ns; 176 client &socket = *pl->ns;
148 object *ob = pl->ob; 177 object *ob = pl->observe;
149 char buf[MAX_BUF]; /* eauugggh */
150 178
151 if (socket.current_map != ob->map) 179 region *reg = ob->region ();
180 if (socket.current_region != reg)
181 {
182 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
183 socket.current_region = reg;
152 { 184 }
185
186 // first try to aovid a full newmap on tiled map scrolls
187 if (socket.current_map != ob->map && !socket.force_newmap)
188 {
189 rv_vector rv;
190
191 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
192
193 // manhattan distance is very handy here
194 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
195 {
196 socket.current_map = ob->map;
197 socket.current_x = ob->x;
198 socket.current_y = ob->y;
199
200 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
201 socket.floorbox_reset ();
202 send_map_info (pl);
203 }
204 }
205
206 if (socket.current_map != ob->map || socket.force_newmap)
207 {
208 clear_map (pl);
153 socket.current_map = ob->map; 209 socket.current_map = ob->map;
154 210 send_map_info (pl);
155 clear_map (pl);
156
157 if (socket.mapinfocmd)
158 {
159 if (ob->map && ob->map->path[0])
160 {
161 int flags = 0;
162
163 if (ob->map->tile_path[0])
164 flags |= 1;
165 if (ob->map->tile_path[1])
166 flags |= 2;
167 if (ob->map->tile_path[2])
168 flags |= 4;
169 if (ob->map->tile_path[3])
170 flags |= 8;
171
172 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
173 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
174 }
175 else
176 snprintf (buf, MAX_BUF, "mapinfo current");
177
178 socket.send_packet (buf);
179 }
180 } 211 }
181 else if (socket.current_x != ob->x || socket.current_y != ob->y) 212 else if (socket.current_x != ob->x || socket.current_y != ob->y)
182 { 213 {
183 int dx = ob->x - socket.current_x; 214 int dx = ob->x - socket.current_x;
184 int dy = ob->y - socket.current_y; 215 int dy = ob->y - socket.current_y;
… …
192 } 223 }
193 } 224 }
194 225
195 socket.current_x = ob->x; 226 socket.current_x = ob->x;
196 socket.current_y = ob->y; 227 socket.current_y = ob->y;
197
198 region *reg = ob->region ();
199 if (socket.current_region != reg)
200 {
201 socket.current_region = reg;
202 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
203 }
204} 228}
205 229
206/** 230/**
207 * RequestInfo is sort of a meta command. There is some specific 231 * RequestInfo is sort of a meta command. There is some specific
208 * request of information, but we call other functions to provide 232 * request of information, but we call other functions to provide
209 * that information. 233 * that information.
210 */ 234 */
211void 235void
212RequestInfo (char *buf, int len, client * ns) 236RequestInfo (char *buf, int len, client *ns)
213{ 237{
214 char *params = NULL, *cp; 238 char *params;
215
216 /* No match */
217 char bigbuf[MAX_BUF];
218 int slen;
219
220 /* Set up replyinfo before we modify any of the buffers - this is used
221 * if we don't find a match.
222 */
223 strcpy (bigbuf, "replyinfo ");
224 slen = strlen (bigbuf);
225 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
226 239
227 /* find the first space, make it null, and update the 240 /* find the first space, make it null, and update the
228 * params pointer. 241 * params pointer.
229 */ 242 */
230 for (cp = buf; *cp != '\0'; cp++) 243 for (params = buf; *params; params++)
231 if (*cp == ' ') 244 if (*params == ' ')
232 { 245 {
233 *cp = '\0';
234 params = cp + 1; 246 *params++ = 0;
235 break; 247 break;
236 } 248 }
237 249
238 if (!strcmp (buf, "image_info")) 250 if (!strcmp (buf, "image_info"))
239 send_image_info (ns, params); 251 send_image_info (ns, params);
… …
242 else if (!strcmp (buf, "skill_info")) 254 else if (!strcmp (buf, "skill_info"))
243 send_skill_info (ns, params); 255 send_skill_info (ns, params);
244 else if (!strcmp (buf, "spell_paths")) 256 else if (!strcmp (buf, "spell_paths"))
245 send_spell_paths (ns, params); 257 send_spell_paths (ns, params);
246 else 258 else
247 ns->send_packet (bigbuf, len); 259 {
260 // undo tokenisation above and send replyinfo with the request unchanged
261 if (*params)
262 *--params = ' ';
263
264 ns->send_packet_printf ("replyinfo %s", buf);
265 }
248} 266}
249 267
250void 268void
251ExtCmd (char *buf, int len, player *pl) 269ExtCmd (char *buf, int len, player *pl)
252{ 270{
… …
255 273
256void 274void
257ExtiCmd (char *buf, int len, client *ns) 275ExtiCmd (char *buf, int len, client *ns)
258{ 276{
259 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 277 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
278}
279
280void
281client::mapinfo_queue_clear ()
282{
283 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
284 free (*i);
285
286 mapinfo_queue.clear ();
287}
288
289bool
290client::mapinfo_try (char *buf)
291{
292 char *token = buf;
293 buf += strlen (buf) + 9;
294
295 // initial map and its origin
296 maptile *map = pl->observe->map;
297 int mapx = pl->ns->mapx / 2 - pl->observe->x;
298 int mapy = pl->ns->mapy / 2 - pl->observe->y;
299 int max_distance = 8; // limit maximum path length to something generous
300
301 while (*buf && map && max_distance)
302 {
303 int dir = *buf++ - '1';
304
305 if (dir >= 0 && dir <= 3)
306 {
307 if (!map->tile_path [dir])
308 map = 0;
309 else if (map->tile_available (dir, false))
310 {
311 maptile *neigh = map->tile_map [dir];
312
313 switch (dir)
314 {
315 case 0: mapy -= neigh->height; break;
316 case 2: mapy += map ->height; break;
317 case 3: mapx -= neigh->width ; break;
318 case 1: mapx += map ->width ; break;
319 }
320
321 map = neigh;
322 --max_distance;
323 }
324 else
325 return 0;
326 }
327 else
328 max_distance = 0;
329 }
330
331 if (!max_distance)
332 send_packet_printf ("mapinfo %s error", token);
333 else if (!map || !map->path)
334 send_packet_printf ("mapinfo %s nomap", token);
335 else
336 {
337 int flags = 0;
338
339 if (map->tile_path[0]) flags |= 1;
340 if (map->tile_path[1]) flags |= 2;
341 if (map->tile_path[2]) flags |= 4;
342 if (map->tile_path[3]) flags |= 8;
343
344 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
345 }
346
347 return 1;
348}
349
350void
351client::mapinfo_queue_run ()
352{
353 if (mapinfo_queue.empty () || !pl)
354 return;
355
356 for (int i = 0; i < mapinfo_queue.size (); ++i)
357 if (mapinfo_try (mapinfo_queue [i]))
358 {
359 free (mapinfo_queue [i]);
360 mapinfo_queue.erase (i);
361 }
362 else
363 ++i;
260} 364}
261 365
262void 366void
263MapInfoCmd (char *buf, int len, player *pl) 367MapInfoCmd (char *buf, int len, player *pl)
264{ 368{
265 // <mapinfo tag spatial tile-path 369 // <mapinfo tag spatial tile-path
266 // >mapinfo tag spatial flags x y w h hash 370 // >mapinfo tag spatial flags x y w h hash
267 371
268 char bigbuf[MAX_BUF], *token;
269
270 token = buf; 372 char *token = buf;
271 // copy token 373
272 if (!(buf = strchr (buf, ' '))) 374 if (!(buf = strchr (buf, ' ')))
273 return; 375 return;
274 376
275 *buf++ = 0;
276
277 if (!strncmp (buf, "spatial ", 8)) 377 if (!strncmp (buf, " spatial ", 9))
278 { 378 {
279 buf += 8; 379 char *copy = strdup (token);
380 copy [buf - token] = 0;
280 381
281 // initial map and its origin 382#if 0
282 maptile *map = pl->ob->map; 383 // this makes only sense when we flush the buffer immediately
283 sint16 dx, dy; 384 if (pl->ns->mapinfo_try (copy))
284 int mapx = pl->ns->mapx / 2 - pl->ob->x; 385 free (copy);
285 int mapy = pl->ns->mapy / 2 - pl->ob->y;
286 int max_distance = 8; // limit maximum path length to something generous
287
288 while (*buf && map && max_distance)
289 {
290 int dir = *buf++;
291
292 switch (dir)
293 {
294 case '1':
295 dx = 0;
296 dy = -1;
297 map = map->xy_find (dx, dy);
298 map && (mapy -= map->height);
299 break;
300 case '2':
301 mapx += map->width;
302 dx = map->width;
303 dy = 0;
304 map = map->xy_find (dx, dy);
305 break;
306 case '3':
307 mapy += map->height;
308 dx = 0;
309 dy = map->height;
310 map = map->xy_find (dx, dy);
311 break;
312 case '4':
313 dx = -1;
314 dy = 0;
315 map = map->xy_find (dx, dy);
316 map && (mapx -= map->width);
317 break;
318 }
319
320 --max_distance;
321 }
322
323 if (!max_distance)
324 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
325 else if (map && map->path[0])
326 {
327 int flags = 0;
328
329 if (map->tile_path[0])
330 flags |= 1;
331 if (map->tile_path[1])
332 flags |= 2;
333 if (map->tile_path[2])
334 flags |= 4;
335 if (map->tile_path[3])
336 flags |= 8;
337
338 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
339 }
340 else 386 else
341 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 387#endif
388 pl->ns->mapinfo_queue.push_back (copy);
342 } 389 }
343 else 390 else
344 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 391 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
345
346 pl->ns->send_packet (bigbuf);
347} 392}
348 393
349/** This is the Setup cmd - easy first implementation */ 394/** This is the Setup cmd */
350void 395void
351SetUp (char *buf, int len, client * ns) 396SetUp (char *buf, int len, client * ns)
352{ 397{
353 int s, slen; 398 INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
354 char *cmd, *param, cmdback[HUGE_BUF];
355
356 /* run through the cmds of setup
357 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
358 *
359 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
360 * The client then must sort this out
361 */
362
363 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
364
365 strcpy (cmdback, "setup");
366 for (s = 0; s < len; )
367 {
368 cmd = &buf[s];
369
370 /* find the next space, and put a null there */
371 for (; buf[s] && buf[s] != ' '; s++)
372 ;
373
374 buf[s++] = 0;
375
376 while (buf[s] == ' ')
377 s++;
378
379 if (s >= len)
380 break;
381
382 param = &buf[s];
383
384 for (; buf[s] && buf[s] != ' '; s++)
385 ;
386
387 buf[s++] = 0;
388
389 while (buf[s] == ' ')
390 s++;
391
392 slen = strlen (cmdback);
393 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
394 safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
395 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
396
397 if (!strcmp (cmd, "sound"))
398 {
399 ns->sound = atoi (param);
400 safe_strcat (cmdback, param, &slen, HUGE_BUF);
401 }
402 else if (!strcmp (cmd, "exp64"))
403 safe_strcat (cmdback, param, &slen, HUGE_BUF);
404 else if (!strcmp (cmd, "spellmon"))
405 {
406 ns->monitor_spells = atoi (param);
407 safe_strcat (cmdback, param, &slen, HUGE_BUF);
408 }
409 else if (!strcmp (cmd, "darkness"))
410 {
411 ns->darkness = atoi (param);
412 safe_strcat (cmdback, param, &slen, HUGE_BUF);
413 }
414 else if (!strcmp (cmd, "map1cmd"))
415 {
416 if (atoi (param))
417 ns->mapmode = Map1Cmd;
418 /* if beyond this size, need to use map1cmd no matter what */
419 if (ns->mapx > 11 || ns->mapy > 11)
420 ns->mapmode = Map1Cmd;
421 safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
422 }
423 else if (!strcmp (cmd, "map1acmd"))
424 {
425 if (atoi (param))
426 ns->mapmode = Map1aCmd;
427 /* if beyond this size, need to use map1acmd no matter what */
428 if (ns->mapx > 11 || ns->mapy > 11)
429 ns->mapmode = Map1aCmd;
430 safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
431 }
432 else if (!strcmp (cmd, "newmapcmd"))
433 {
434 ns->newmapcmd = atoi (param);
435 safe_strcat (cmdback, param, &slen, HUGE_BUF);
436 }
437 else if (!strcmp (cmd, "mapinfocmd"))
438 {
439 ns->mapinfocmd = atoi (param);
440 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
441 }
442 else if (!strcmp (cmd, "extcmd"))
443 {
444 ns->extcmd = atoi (param);
445 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
446 }
447 else if (!strcmp (cmd, "extmap"))
448 {
449 ns->extmap = atoi (param);
450 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
451 }
452 else if (!strcmp (cmd, "facecache"))
453 {
454 ns->facecache = atoi (param);
455 safe_strcat (cmdback, param, &slen, HUGE_BUF);
456 }
457 else if (!strcmp (cmd, "faceset"))
458 {
459 char tmpbuf[20];
460 int q = atoi (param);
461
462 if (is_valid_faceset (q))
463 ns->faceset = q;
464 sprintf (tmpbuf, "%d", ns->faceset);
465 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
466 /* if the client is using faceset, it knows about image2 command */
467 ns->image2 = 1;
468 }
469 else if (!strcmp (cmd, "itemcmd"))
470 {
471 /* Version of the item protocol command to use. Currently,
472 * only supported versions are 1 and 2. Using a numeric
473 * value will make it very easy to extend this in the future.
474 */
475 char tmpbuf[20];
476 int q = atoi (param);
477
478 if (q < 1 || q > 2)
479 {
480 strcpy (tmpbuf, "FALSE");
481 }
482 else
483 {
484 ns->itemcmd = q;
485 sprintf (tmpbuf, "%d", ns->itemcmd);
486 }
487 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
488 }
489 else if (!strcmp (cmd, "mapsize"))
490 {
491 int x, y = 0;
492 char tmpbuf[MAX_BUF], *cp;
493
494 x = atoi (param);
495 for (cp = param; *cp != 0; cp++)
496 if (*cp == 'x' || *cp == 'X')
497 {
498 y = atoi (cp + 1);
499 break;
500 }
501
502 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
503 {
504 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
505 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
506 }
507 else
508 {
509 ns->mapx = x;
510 ns->mapy = y;
511 /* better to send back what we are really using and not the
512 * param as given to us in case it gets parsed differently.
513 */
514 sprintf (tmpbuf, "%dx%d", x, y);
515 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
516 /* If beyond this size and still using orig map command, need to
517 * go to map1cmd.
518 */
519 if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
520 ns->mapmode = Map1Cmd;
521 }
522 }
523 else if (!strcmp (cmd, "extendedMapInfos"))
524 {
525 /* Added by tchize
526 * prepare to use the mapextended command
527 */
528 char tmpbuf[20];
529
530 ns->ext_mapinfos = (atoi (param));
531 sprintf (tmpbuf, "%d", ns->ext_mapinfos);
532 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
533 }
534 else if (!strcmp (cmd, "extendedTextInfos"))
535 {
536 /* Added by tchize
537 * prepare to use the extended text commands
538 * Client toggle this to non zero to get exttext
539 */
540 char tmpbuf[20];
541
542 ns->has_readable_type = (atoi (param));
543 sprintf (tmpbuf, "%d", ns->has_readable_type);
544 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
545 }
546 else
547 {
548 /* Didn't get a setup command we understood -
549 * report a failure to the client.
550 */
551 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
552 }
553 } /* for processing all the setup commands */
554
555 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
556 ns->send_packet (cmdback);
557} 399}
558 400
559/** 401/**
560 * The client has requested to be added to the game. 402 * The client has requested to be added to the game.
561 * This is what takes care of it. We tell the client how things worked out. 403 * This is what takes care of it. We tell the client how things worked out.
562 * I am not sure if this file is the best place for this function. however, 404 * I am not sure if this file is the best place for this function. however,
563 * it either has to be here or init_sockets needs to be exported. 405 * it either has to be here or init_sockets needs to be exported.
564 */ 406 */
565void 407void
566AddMeCmd (char *buf, int len, client * ns) 408AddMeCmd (char *buf, int len, client *ns)
567{ 409{
568 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 410 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
569} 411}
570 412
571/** Reply to ExtendedInfos command */ 413/** Reply to ExtendedInfos command */
… …
683 525
684 ns->send_packet (cmdback); 526 ns->send_packet (cmdback);
685} 527}
686 528
687/** 529/**
688 * Tells client the picture it has to use
689 * to smooth a picture number given as argument.
690 */
691void
692AskSmooth (char *buf, int len, client *ns)
693{
694 ns->send_face (atoi (buf));
695}
696
697/**
698 * This handles the general commands from the client (ie, north, fire, cast, 530 * This handles the general commands from the client (ie, north, fire, cast,
699 * etc.) 531 * etc.)
700 */ 532 */
701void 533void
702PlayerCmd (char *buf, int len, player *pl) 534PlayerCmd (char *buf, int len, player *pl)
… …
723 * commands. 555 * commands.
724 */ 556 */
725 pl->count = 0; 557 pl->count = 0;
726} 558}
727 559
728
729/** 560/**
730 * This handles the general commands from the client (ie, north, fire, cast, 561 * This handles the general commands from the client (ie, north, fire, cast,
731 * etc.). It is a lot like PlayerCmd above, but is called with the 562 * etc.). It is a lot like PlayerCmd above, but is called with the
732 * 'ncom' method which gives more information back to the client so it 563 * 'ncom' method which gives more information back to the client so it
733 * can throttle. 564 * can throttle.
… …
735void 566void
736NewPlayerCmd (char *buf, int len, player *pl) 567NewPlayerCmd (char *buf, int len, player *pl)
737{ 568{
738 if (len <= 6) 569 if (len <= 6)
739 { 570 {
740 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 571 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
741 return; 572 return;
742 } 573 }
743 574
744 uint16 cmdid = net_uint16 ((uint8 *)buf); 575 uint16 cmdid = net_uint16 ((uint8 *)buf);
745 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 576 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
802 { 633 {
803 case ST_PLAYING: 634 case ST_PLAYING:
804 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 635 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
805 break; 636 break;
806 637
807 case ST_CHANGE_CLASS:
808 key_change_class (pl->ob, buf[0]);
809 break;
810
811 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 638 case ST_GET_PARTY_PASSWORD: /* Get password for party */
812 receive_party_password (pl->ob, 13); 639 receive_party_password (pl->ob, 13);
813 break; 640 break;
814 641
815 default: 642 default:
… …
854 681
855 cp = strchr (cp + 1, ' '); 682 cp = strchr (cp + 1, ' ');
856 683
857 if (cp) 684 if (cp)
858 { 685 {
859 assign (ns->version, cp + 1); 686 ns->version = cp + 1;
860 687
861 if (ns->sc_version < 1026) 688 if (ns->sc_version < 1026)
862 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 689 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
863 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 690 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
864 } 691 }
… …
887 * syntax is: move (to) (tag) (nrof) 714 * syntax is: move (to) (tag) (nrof)
888 */ 715 */
889void 716void
890MoveCmd (char *buf, int len, player *pl) 717MoveCmd (char *buf, int len, player *pl)
891{ 718{
892 int vals[3], i; 719 int to, tag, nrof;
893 720
894 /* A little funky here. We only cycle for 2 records, because 721 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
895 * we obviously are not going to find a space after the third
896 * record. Perhaps we should just replace this with a
897 * sscanf?
898 */
899 for (i = 0; i < 2; i++)
900 { 722 {
901 vals[i] = atoi (buf);
902
903 if (!(buf = strchr (buf, ' ')))
904 {
905 LOG (llevError, "Incomplete move command: %s\n", buf); 723 LOG (llevError, "Incomplete move command: %s\n", buf);
906 return; 724 return;
907 }
908
909 buf++;
910 } 725 }
911 726
912 vals[2] = atoi (buf); 727 esrv_move_object (pl->ob, to, tag, nrof);
913
914/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
915 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
916} 728}
917 729
918/****************************************************************************** 730/******************************************************************************
919 * 731 *
920 * Start of commands the server sends to the client. 732 * Start of commands the server sends to the client.
… …
924/** 736/**
925 * Asks the client to query the user. This way, the client knows 737 * Asks the client to query the user. This way, the client knows
926 * it needs to send something back (vs just printing out a message) 738 * it needs to send something back (vs just printing out a message)
927 */ 739 */
928void 740void
929send_query (client *ns, uint8 flags, char *text) 741send_query (client *ns, uint8 flags, const char *text)
930{ 742{
931 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 743 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
744}
745
746/**
747 * Get player's current range attack in obuf.
748 */
749static void
750rangetostring (player *pl, char *obuf)
751{
752 dynbuf_text buf;
753
754 if (pl->ranged_ob)
755 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
756
757 if (pl->combat_ob)
758 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
759
760#if 0
761 //TODO: remove this when slot system is working, this is only for debugging
762 if (pl->ob->chosen_skill)
763 buf << " Skill*: " << pl->ob->chosen_skill->name;
764#endif
765
766 //TODO: maybe golem should become the current_weapon, quite simply?
767 if (pl->golem)
768 buf << " Golem*: " << pl->golem->name;
769
770 buf << '\0';
771 buf.linearise (obuf);
932} 772}
933 773
934#define AddIfInt64(Old,New,Type) if (Old != New) {\ 774#define AddIfInt64(Old,New,Type) if (Old != New) {\
935 Old = New; \ 775 Old = New; \
936 sl << uint8 (Type) << uint64 (New); \ 776 sl << uint8 (Type) << uint64 (New); \
… …
944#define AddIfShort(Old,New,Type) if (Old != New) {\ 784#define AddIfShort(Old,New,Type) if (Old != New) {\
945 Old = New; \ 785 Old = New; \
946 sl << uint8 (Type) << uint16 (New); \ 786 sl << uint8 (Type) << uint16 (New); \
947 } 787 }
948 788
949#define AddIfFloat(Old,New,Type) if (Old != New) {\ 789#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
950 Old = New; \ 790 Old = New; \
951 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 791 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
952 } 792 }
953 793
954#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 794#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
955 free(Old); Old = strdup (New);\ 795 free(Old); Old = strdup (New);\
956 sl << uint8 (Type) << data8 (New); \ 796 sl << uint8 (Type) << data8 (New); \
… …
970 810
971 client *ns = pl->ns; 811 client *ns = pl->ns;
972 if (!ns) 812 if (!ns)
973 return; 813 return;
974 814
975 object *ob = pl->ob; 815 object *ob = pl->observe;
976 if (!ob) 816 if (!ob)
977 return; 817 return;
818
819 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
978 820
979 packet sl ("stats"); 821 packet sl ("stats");
980 822
981 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 823 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
982 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 824 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
991 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 833 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
992 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 834 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
993 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 835 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
994 836
995 for (int s = 0; s < NUM_SKILLS; s++) 837 for (int s = 0; s < NUM_SKILLS; s++)
996 if (object *skill = pl->last_skill_ob[s]) 838 if (object *skill = opl->last_skill_ob[s])
997 if (skill->stats.exp != ns->last_skill_exp [s]) 839 if (skill->stats.exp != ns->last_skill_exp [s])
998 { 840 {
999 ns->last_skill_exp [s] = skill->stats.exp; 841 ns->last_skill_exp [s] = skill->stats.exp;
1000 842
1001 /* Always send along the level if exp changes. This is only 843 /* Always send along the level if exp changes. This is only
… …
1009 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 851 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1010 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 852 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1011 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 853 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1012 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 854 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1013 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 855 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1014 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 856 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1015 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 857 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1016 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 858 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
1017 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 859 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1018 860
1019 flags = 0; 861 flags = 0;
1020 862
1021 if (pl->fire_on) 863 if (opl->fire_on)
1022 flags |= SF_FIREON; 864 flags |= SF_FIREON;
1023 865
1024 if (pl->run_on) 866 if (opl->run_on)
1025 flags |= SF_RUNON; 867 flags |= SF_RUNON;
1026 868
1027 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 869 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1028 870
1029 if (ns->sc_version < 1025) 871 if (ns->sc_version < 1025)
… …
1043 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 885 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1044 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 886 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1045 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 887 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1046 } 888 }
1047 889
1048 rangetostring (ob, buf); /* we want use the new fire & run system in new client */ 890 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
1049 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 891 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1050 set_title (ob, buf); 892 set_title (ob, buf);
1051 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 893 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1052 894
1053 /* Only send it away if we have some actual data */ 895 /* Only send it away if we have some actual data */
… …
1057 899
1058/** 900/**
1059 * Tells the client that here is a player it should start using. 901 * Tells the client that here is a player it should start using.
1060 */ 902 */
1061void 903void
1062esrv_new_player (player *pl, uint32 weight) 904esrv_new_player (player *pl)
1063{ 905{
906 sint32 weight = pl->ob->client_weight ();
907
1064 packet sl ("player"); 908 packet sl ("player");
1065 909
1066 sl << uint32 (pl->ob->count) 910 sl << uint32 (pl->ob->count)
1067 << uint32 (weight) 911 << uint32 (weight)
1068 << uint32 (pl->ob->face) 912 << uint32 (pl->ob->face)
… …
1135 979
1136 if (!ns.faces_sent[face_num]) 980 if (!ns.faces_sent[face_num])
1137 if (ob) 981 if (ob)
1138 ns.send_faces (ob); 982 ns.send_faces (ob);
1139 else 983 else
1140 ns.send_face (face_num); 984 ns.send_face (face_num, 10);
1141 985
1142 sl << uint16 (face_num); 986 sl << uint16 (face_num);
1143 return 1; 987 return 1;
1144 } 988 }
1145 989
… …
1187{ 1031{
1188 prefetch_surrounding_maps (op->map, 3); 1032 prefetch_surrounding_maps (op->map, 3);
1189} 1033}
1190 1034
1191/** 1035/**
1192 * This function uses the new map1 protocol command to send the map 1036 * Draws client map.
1193 * to the client. It is necessary because the old map command supports
1194 * a maximum map size of 15x15.
1195 * This function is much simpler than the old one. This is because
1196 * the old function optimized to send as few face identifiers as possible,
1197 * at the expense of sending more coordinate location (coordinates were
1198 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1199 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1200 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1201 * and use the other 4 bits for other informatiion. For full documentation
1202 * of what we send, see the doc/Protocol file.
1203 * I will describe internally what we do:
1204 * the ns->lastmap shows how the map last looked when sent to the client.
1205 * in the lastmap structure, there is a cells array, which is set to the
1206 * maximum viewable size (As set in config.h).
1207 * in the cells, there are faces and a count value.
1208 * we use the count value to hold the darkness value. If -1, then this space
1209 * is not viewable.
1210 * we use faces[0] faces[1] faces[2] to hold what the three layers
1211 * look like.
1212 */ 1037 */
1213void 1038void
1214draw_client_map1 (object *pl) 1039draw_client_map (player *pl)
1215{ 1040{
1041 object *ob = pl->observe;
1042 if (!ob->active)
1043 return;
1044
1045 maptile *plmap = ob->map;
1046
1047 /* If player is just joining the game, he isn't here yet, so the map
1048 * can get swapped out. If so, don't try to send them a map. All will
1049 * be OK once they really log in.
1050 */
1051 if (!plmap || plmap->in_memory != MAP_ACTIVE)
1052 return;
1053
1216 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1054 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1217 sint16 nx, ny;
1218 int estartlen, eoldlen; 1055 int estartlen, eoldlen;
1219 uint8 eentrysize; 1056 uint8 eentrysize;
1220 uint16 ewhatstart, ewhatflag; 1057 uint16 ewhatstart, ewhatflag;
1221 uint8 extendedinfos; 1058 uint8 extendedinfos;
1222 maptile *m;
1223 1059
1224 client &socket = *pl->contr->ns;
1225
1226 if (!pl->active)
1227 return;
1228
1229 check_map_change (pl->contr); 1060 check_map_change (pl);
1230 prefetch_surrounding_maps (pl); 1061 prefetch_surrounding_maps (pl->ob);
1062
1063 /* do LOS after calls to update_position */
1064 if (ob != pl->ob)
1065 clear_los (pl);
1066 else if (pl->do_los)
1067 {
1068 update_los (ob);
1069 pl->do_los = 0;
1070 }
1071
1072 /**
1073 * This function uses the new map1 protocol command to send the map
1074 * to the client. It is necessary because the old map command supports
1075 * a maximum map size of 15x15.
1076 * This function is much simpler than the old one. This is because
1077 * the old function optimized to send as few face identifiers as possible,
1078 * at the expense of sending more coordinate location (coordinates were
1079 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1080 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1081 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1082 * and use the other 4 bits for other informatiion. For full documentation
1083 * of what we send, see the doc/Protocol file.
1084 * I will describe internally what we do:
1085 * the ns->lastmap shows how the map last looked when sent to the client.
1086 * in the lastmap structure, there is a cells array, which is set to the
1087 * maximum viewable size (As set in config.h).
1088 * in the cells, there are faces and a count value.
1089 * we use the count value to hold the darkness value. If -1, then this space
1090 * is not viewable.
1091 * we use faces[0] faces[1] faces[2] to hold what the three layers
1092 * look like.
1093 */
1094
1095 client &socket = *pl->ns;
1231 1096
1232 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1097 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1233 packet esl; 1098 packet esl;
1234 1099
1235 startlen = sl.length (); 1100 startlen = sl.length ();
… …
1250 << uint8 (extendedinfos) 1115 << uint8 (extendedinfos)
1251 << uint8 (eentrysize); 1116 << uint8 (eentrysize);
1252 1117
1253 estartlen = esl.length (); 1118 estartlen = esl.length ();
1254 } 1119 }
1255 else
1256 {
1257 /* suppress compiler warnings */
1258 ewhatstart = 0;
1259 ewhatflag = 0;
1260 estartlen = 0;
1261 }
1262 1120
1263 /* x,y are the real map locations. ax, ay are viewport relative 1121 /* x,y are the real map locations. ax, ay are viewport relative
1264 * locations. 1122 * locations.
1265 */ 1123 */
1266 ay = 0; 1124 ay = 0;
1267 1125
1268 /* We could do this logic as conditionals in the if statement, 1126 /* We could do this logic as conditionals in the if statement,
1269 * but that started to get a bit messy to look at. 1127 * but that started to get a bit messy to look at.
1270 */ 1128 */
1271 max_x = pl->x + (socket.mapx + 1) / 2; 1129 max_x = ob->x + (socket.mapx + 1) / 2;
1272 max_y = pl->y + (socket.mapy + 1) / 2; 1130 max_y = ob->y + (socket.mapy + 1) / 2;
1273 1131
1274 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1132 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1275 { 1133 {
1134 sint16 nx, ny;
1135 maptile *m = 0;
1136
1276 ax = 0; 1137 ax = 0;
1277 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1138 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1278 { 1139 {
1140 // check to see if we can simply go one right quickly
1141 ++nx;
1142 if (m && nx >= m->width)
1143 m = 0;
1144
1145 if (!m)
1146 {
1147 nx = x; ny = y; m = plmap;
1148
1149 if (xy_normalise (m, nx, ny))
1150 m->touch ();
1151 else
1152 m = 0;
1153 }
1154
1279 int emask, mask; 1155 int emask, mask;
1280 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1156 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1281 1157
1282 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1158 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1283 1159
1284 /* If the coordinates are not valid, or it is too dark to see, 1160 /* If the coordinates are not valid, or it is too dark to see,
1285 * we tell the client as such 1161 * we tell the client as such
1286 */ 1162 */
1287 nx = x;
1288 ny = y;
1289 m = get_map_from_coord (pl->map, &nx, &ny);
1290
1291 if (!m) 1163 if (!m)
1292 { 1164 {
1293 /* space is out of map. Update space and clear values 1165 /* space is out of map. Update space and clear values
1294 * if this hasn't already been done. If the space is out 1166 * if this hasn't already been done. If the space is out
1295 * of the map, it shouldn't have a head 1167 * of the map, it shouldn't have a head
… …
1301 } 1173 }
1302 1174
1303 continue; 1175 continue;
1304 } 1176 }
1305 1177
1306 m->touch ();
1307
1308 int d = pl->contr->blocked_los[ax][ay]; 1178 int d = pl->blocked_los[ax][ay];
1309 1179
1310 if (d > 3) 1180 if (d > 3)
1311 { 1181 {
1312
1313 int need_send = 0, count; 1182 int need_send = 0, count;
1314 1183
1315 /* This block deals with spaces that are not visible for whatever 1184 /* This block deals with spaces that are not visible for whatever
1316 * reason. Still may need to send the head for this space. 1185 * reason. Still may need to send the head for this space.
1317 */ 1186 */
… …
1323 if (lastcell.count != -1) 1192 if (lastcell.count != -1)
1324 need_send = 1; 1193 need_send = 1;
1325 1194
1326 count = -1; 1195 count = -1;
1327 1196
1328 /* properly clear a previously sent big face */
1329 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2] 1197 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1330 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1198 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1331 need_send = 1; 1199 need_send = 1;
1332 1200
1201 /* properly clear a previously sent big face */
1333 map_clearcell (&lastcell, count); 1202 map_clearcell (&lastcell, count);
1334 1203
1335 if ((mask & 0xf) || need_send) 1204 if ((mask & 0xf) || need_send)
1336 sl[oldlen + 1] = mask & 0xff; 1205 sl[oldlen + 1] = mask & 0xff;
1337 else 1206 else
… …
1376 } 1245 }
1377 1246
1378 lastcell.count = d; 1247 lastcell.count = d;
1379 1248
1380 mapspace &ms = m->at (nx, ny); 1249 mapspace &ms = m->at (nx, ny);
1250 ms.update ();
1381 1251
1382 if (socket.extmap) 1252 if (socket.extmap)
1383 { 1253 {
1384 uint8 stat_hp = 0; 1254 uint8 stat_hp = 0;
1385 uint8 stat_width = 0; 1255 uint8 stat_width = 0;
1386 uint8 flags = 0; 1256 uint8 flags = 0;
1387 UUID player = 0; 1257 tag_t player = 0;
1388 1258
1389 // send hp information, if applicable 1259 // send hp information, if applicable
1390 if (object *op = ms.faces_obj [0]) 1260 if (object *op = ms.faces_obj [0])
1261 if (op->is_head () && !op->invisible)
1391 { 1262 {
1392 if (op->head || op->invisible) 1263 if (op->stats.maxhp > op->stats.hp
1393 ; // do not show 1264 && op->stats.maxhp > 0
1394 else if (op->type == PLAYER 1265 && (op->type == PLAYER
1266 || op->type == DOOR // does not work, have maxhp 0
1395 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1267 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)))
1396 {
1397 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1398 { 1268 {
1399 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1269 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1400 stat_width = op->arch->tail_x; 1270 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1401 } 1271 }
1402 }
1403 1272
1404 if (op->msg && op->msg[0] == '@') 1273 if (op->msg && op->msg[0] == '@')
1405 flags |= 1; 1274 flags |= 1;
1406 1275
1407 if (op->type == PLAYER && op != pl) 1276 if (op->type == PLAYER)
1408 player = op->count; 1277 player = op->count;
1409 } 1278 }
1410 1279
1411 if (lastcell.stat_hp != stat_hp) 1280 if (lastcell.stat_hp != stat_hp)
1412 { 1281 {
1413 lastcell.stat_hp = stat_hp; 1282 lastcell.stat_hp = stat_hp;
1414 1283
… …
1433 1302
1434 mask |= 0x8; 1303 mask |= 0x8;
1435 *last_ext |= 0x80; 1304 *last_ext |= 0x80;
1436 last_ext = &sl[sl.length ()]; 1305 last_ext = &sl[sl.length ()];
1437 1306
1438 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1307 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1439 } 1308 }
1440 1309
1441 if (lastcell.flags != flags) 1310 if (lastcell.flags != flags)
1442 { 1311 {
1443 lastcell.flags = flags; 1312 lastcell.flags = flags;
… …
1456 1325
1457 /* Middle face */ 1326 /* Middle face */
1458 if (update_space (sl, socket, ms, lastcell, 1)) 1327 if (update_space (sl, socket, ms, lastcell, 1))
1459 mask |= 0x2; 1328 mask |= 0x2;
1460 1329
1461 if (ms.player () == pl 1330 if (ms.player () == ob
1462 && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) 1331 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1463 { 1332 {
1464 // force player to be visible to himself if invisible 1333 // force player to be visible to himself if invisible
1465 if (lastcell.faces[0] != pl->face) 1334 if (lastcell.faces[0] != ob->face)
1466 { 1335 {
1467 lastcell.faces[0] = pl->face; 1336 lastcell.faces[0] = ob->face;
1468 1337
1469 mask |= 0x1; 1338 mask |= 0x1;
1470 sl << uint16 (pl->face); 1339 sl << uint16 (ob->face);
1471 1340
1472 socket.send_faces (pl); 1341 socket.send_faces (ob);
1473 } 1342 }
1474 } 1343 }
1475 /* Top face */ 1344 /* Top face */
1476 else if (update_space (sl, socket, ms, lastcell, 0)) 1345 else if (update_space (sl, socket, ms, lastcell, 0))
1477 mask |= 0x1; 1346 mask |= 0x1;
1478
1479 1347
1480 /* Check to see if we are in fact sending anything for this 1348 /* Check to see if we are in fact sending anything for this
1481 * space by checking the mask. If so, update the mask. 1349 * space by checking the mask. If so, update the mask.
1482 * if not, reset the len to that from before adding the mask 1350 * if not, reset the len to that from before adding the mask
1483 * value, so we don't send those bits. 1351 * value, so we don't send those bits.
… …
1517 } 1385 }
1518 } /* else this is a viewable space */ 1386 } /* else this is a viewable space */
1519 } /* for x loop */ 1387 } /* for x loop */
1520 } /* for y loop */ 1388 } /* for y loop */
1521 1389
1390 socket.flush_fx ();
1391
1522 /* Verify that we in fact do need to send this */ 1392 /* Verify that we in fact do need to send this */
1523 if (socket.ext_mapinfos) 1393 if (socket.ext_mapinfos)
1524 { 1394 {
1525 if (!(sl.length () > startlen || socket.sent_scroll)) 1395 if (!(sl.length () > startlen || socket.sent_scroll))
1526 { 1396 {
… …
1540 socket.send_packet (sl); 1410 socket.send_packet (sl);
1541 socket.sent_scroll = 0; 1411 socket.sent_scroll = 0;
1542 } 1412 }
1543} 1413}
1544 1414
1545/**
1546 * Draws client map.
1547 */
1548void
1549draw_client_map (object *pl)
1550{
1551 int i, j;
1552 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1553 int mflags;
1554 struct Map newmap;
1555 maptile *m, *pm;
1556
1557 if (pl->type != PLAYER)
1558 {
1559 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1560 return;
1561 }
1562
1563 pm = pl->map;
1564
1565 /* If player is just joining the game, he isn't here yet, so the map
1566 * can get swapped out. If so, don't try to send them a map. All will
1567 * be OK once they really log in.
1568 */
1569 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1570 return;
1571
1572 memset (&newmap, 0, sizeof (struct Map));
1573
1574 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1575 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1576 {
1577 ax = i;
1578 ay = j;
1579 m = pm;
1580 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1581
1582 if (mflags & P_OUT_OF_MAP)
1583 continue;
1584
1585 /* If a map is visible to the player, we don't want to swap it out
1586 * just to reload it. This should really call something like
1587 * swap_map, but this is much more efficient and 'good enough'
1588 */
1589 if (mflags & P_NEW_MAP)
1590 m->timeout = 50;
1591 }
1592
1593 /* do LOS after calls to update_position */
1594 if (pl->contr->do_los)
1595 {
1596 update_los (pl);
1597 pl->contr->do_los = 0;
1598 }
1599
1600 /* Big maps need a different drawing mechanism to work */
1601 draw_client_map1 (pl);
1602}
1603
1604
1605/*****************************************************************************/ 1415/*****************************************************************************/
1606
1607/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 1416/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1608
1609/* a player. Of course, the client need to know the command to be able to */ 1417/* a player. Of course, the client need to know the command to be able to */
1610
1611/* manage it ! */ 1418/* manage it ! */
1612
1613/*****************************************************************************/ 1419/*****************************************************************************/
1614void 1420void
1615send_plugin_custom_message (object *pl, char *buf) 1421send_plugin_custom_message (object *pl, char *buf)
1616{ 1422{
1617 pl->contr->ns->send_packet (buf); 1423 pl->contr->ns->send_packet (buf);
… …
1628 sl << "replyinfo skill_info\n"; 1434 sl << "replyinfo skill_info\n";
1629 1435
1630 for (int i = 1; i < NUM_SKILLS; i++) 1436 for (int i = 1; i < NUM_SKILLS; i++)
1631 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1437 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1632 1438
1633 if (sl.length () >= MAXSOCKBUF) 1439 if (sl.length () > MAXSOCKBUF)
1634 { 1440 {
1635 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1441 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1636 fatal (0); 1442 fatal (0);
1637 } 1443 }
1638 1444
… …
1651 sl << "replyinfo spell_paths\n"; 1457 sl << "replyinfo spell_paths\n";
1652 1458
1653 for (int i = 0; i < NRSPELLPATHS; i++) 1459 for (int i = 0; i < NRSPELLPATHS; i++)
1654 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1460 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1655 1461
1656 if (sl.length () >= MAXSOCKBUF) 1462 if (sl.length () > MAXSOCKBUF)
1657 { 1463 {
1658 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1464 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1659 fatal (0); 1465 fatal (0);
1660 } 1466 }
1661 1467
… …
1680 if (spell->type == SPELL) 1486 if (spell->type == SPELL)
1681 { 1487 {
1682 int flags = 0; 1488 int flags = 0;
1683 1489
1684 /* check if we need to update it */ 1490 /* check if we need to update it */
1685 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1491 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1686 { 1492 {
1687 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1493 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1688 flags |= UPD_SP_MANA; 1494 flags |= UPD_SP_MANA;
1689 } 1495 }
1690 1496
1691 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1497 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1692 { 1498 {
1693 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1499 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1694 flags |= UPD_SP_GRACE; 1500 flags |= UPD_SP_GRACE;
1695 } 1501 }
1696 1502
1697 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1503 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1698 { 1504 {
1699 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1505 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1700 flags |= UPD_SP_DAMAGE; 1506 flags |= UPD_SP_DAMAGE;
1701 } 1507 }
1702 1508
1703 if (flags) 1509 if (flags)
1704 { 1510 {
… …
1706 1512
1707 sl << "updspell " 1513 sl << "updspell "
1708 << uint8 (flags) 1514 << uint8 (flags)
1709 << uint32 (spell->count); 1515 << uint32 (spell->count);
1710 1516
1711 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1517 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1712 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1518 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1713 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1519 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1714 1520
1715 pl->ns->send_packet (sl); 1521 pl->ns->send_packet (sl);
1716 } 1522 }
1717 } 1523 }
1718 } 1524 }
… …
1748 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1554 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1749 return; 1555 return;
1750 } 1556 }
1751 1557
1752 /* store costs and damage in the object struct, to compare to later */ 1558 /* store costs and damage in the object struct, to compare to later */
1753 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1559 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1754 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1560 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1755 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1561 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1756 1562
1757 /* figure out which skill it uses, if it uses one */ 1563 /* figure out which skill it uses, if it uses one */
1758 if (spell->skill) 1564 if (spell->skill)
1759 { 1565 {
1760 for (i = 1; i < NUM_SKILLS; i++) 1566 for (i = 1; i < NUM_SKILLS; i++)
… …
1770 { 1576 {
1771 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1577 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1772 spell->face = face_find ("burnout.x11", blank_face); 1578 spell->face = face_find ("burnout.x11", blank_face);
1773 } 1579 }
1774 1580
1581 pl->ns->send_face (spell->face);
1582
1775 /* send the current values */ 1583 /* send the current values */
1776 sl << uint32 (spell->count) 1584 sl << uint32 (spell->count)
1777 << uint16 (spell->level) 1585 << uint16 (spell->level)
1778 << uint16 (spell->casting_time) 1586 << uint16 (spell->casting_time)
1779 << uint16 (spell->last_sp) 1587 << uint16 (spell->cached_sp)
1780 << uint16 (spell->last_grace) 1588 << uint16 (spell->cached_grace)
1781 << uint16 (spell->last_eat) 1589 << uint16 (spell->cached_eat)
1782 << uint8 (skill) 1590 << uint8 (skill)
1783 << uint32 (spell->path_attuned) 1591 << uint32 (spell->path_attuned)
1784 << uint32 (spell->face) 1592 << uint32 (spell->face)
1785 << data8 (spell->name) 1593 << data8 (spell->name)
1786 << data16 (spell->msg); 1594 << data16 (spell->msg);
… …
1814 * bytes and 3 strings (because that is the spec) so we need to 1622 * bytes and 3 strings (because that is the spec) so we need to
1815 * check that the length of those 3 strings, plus the 23 bytes, 1623 * check that the length of those 3 strings, plus the 23 bytes,
1816 * won't take us over the length limit for the socket, if it does, 1624 * won't take us over the length limit for the socket, if it does,
1817 * we need to send what we already have, and restart packet formation 1625 * we need to send what we already have, and restart packet formation
1818 */ 1626 */
1627 if (spell->type != SPELL)
1628 continue;
1629
1819 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1630 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1820 * to show add_spell is 26 bytes + 2 strings. However, the overun 1631 * to show add_spell is 26 bytes + 2 strings. However, the overun
1821 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1632 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1822 * like it will fix this 1633 * like it will fix this
1823 */ 1634 */
1824 if (spell->type != SPELL)
1825 continue;
1826
1827 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1635 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1828 { 1636 {
1637 pl->ns->flush_fx ();
1829 pl->ns->send_packet (sl); 1638 pl->ns->send_packet (sl);
1830 1639
1831 sl.reset (); 1640 sl.reset ();
1832 sl << "addspell "; 1641 sl << "addspell ";
1833 } 1642 }
… …
1841 return; 1650 return;
1842 } 1651 }
1843 else 1652 else
1844 append_spell (pl, sl, spell); 1653 append_spell (pl, sl, spell);
1845 1654
1846 if (sl.length () >= MAXSOCKBUF) 1655 if (sl.length () > MAXSOCKBUF)
1847 { 1656 {
1848 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1657 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1849 fatal (0); 1658 fatal (0);
1850 } 1659 }
1851 1660
1852 /* finally, we can send the packet */ 1661 /* finally, we can send the packet */
1662 pl->ns->flush_fx ();
1853 pl->ns->send_packet (sl); 1663 pl->ns->send_packet (sl);
1854} 1664}
1855 1665

Diff Legend

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