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.101 by root, Sun Jun 3 17:05:36 2007 UTC vs.
Revision 1.129 by root, Tue May 6 19:37:01 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * 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, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors 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));
136 137
137 pl->ns->force_newmap = false; 138 pl->ns->force_newmap = false;
138 139
139 if (pl->ns->newmapcmd == 1) 140 if (pl->ns->newmapcmd == 1)
… …
191 socket.current_y = ob->y; 192 socket.current_y = ob->y;
192 193
193 region *reg = ob->region (); 194 region *reg = ob->region ();
194 if (socket.current_region != reg) 195 if (socket.current_region != reg)
195 { 196 {
197 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
196 socket.current_region = reg; 198 socket.current_region = reg;
197 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
198 } 199 }
199} 200}
200 201
201/** 202/**
202 * RequestInfo is sort of a meta command. There is some specific 203 * RequestInfo is sort of a meta command. There is some specific
203 * request of information, but we call other functions to provide 204 * request of information, but we call other functions to provide
204 * that information. 205 * that information.
205 */ 206 */
206void 207void
207RequestInfo (char *buf, int len, client * ns) 208RequestInfo (char *buf, int len, client *ns)
208{ 209{
209 char *params = NULL, *cp; 210 char *params;
210
211 /* No match */
212 char bigbuf[MAX_BUF];
213 int slen;
214
215 /* Set up replyinfo before we modify any of the buffers - this is used
216 * if we don't find a match.
217 */
218 strcpy (bigbuf, "replyinfo ");
219 slen = strlen (bigbuf);
220 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
221 211
222 /* find the first space, make it null, and update the 212 /* find the first space, make it null, and update the
223 * params pointer. 213 * params pointer.
224 */ 214 */
225 for (cp = buf; *cp != '\0'; cp++) 215 for (params = buf; *params; params++)
226 if (*cp == ' ') 216 if (*params == ' ')
227 { 217 {
228 *cp = '\0';
229 params = cp + 1; 218 *params++ = 0;
230 break; 219 break;
231 } 220 }
232 221
233 if (!strcmp (buf, "image_info")) 222 if (!strcmp (buf, "image_info"))
234 send_image_info (ns, params); 223 send_image_info (ns, params);
… …
237 else if (!strcmp (buf, "skill_info")) 226 else if (!strcmp (buf, "skill_info"))
238 send_skill_info (ns, params); 227 send_skill_info (ns, params);
239 else if (!strcmp (buf, "spell_paths")) 228 else if (!strcmp (buf, "spell_paths"))
240 send_spell_paths (ns, params); 229 send_spell_paths (ns, params);
241 else 230 else
242 ns->send_packet (bigbuf, len); 231 {
232 // undo tokenisation above and send replyinfo with the request unchanged
233 if (*params)
234 *--params = ' ';
235
236 ns->send_packet_printf ("replyinfo %s", buf);
237 }
243} 238}
244 239
245void 240void
246ExtCmd (char *buf, int len, player *pl) 241ExtCmd (char *buf, int len, player *pl)
247{ 242{
… …
250 245
251void 246void
252ExtiCmd (char *buf, int len, client *ns) 247ExtiCmd (char *buf, int len, client *ns)
253{ 248{
254 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 249 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
250}
251
252void
253client::mapinfo_queue_clear ()
254{
255 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
256 free (*i);
257
258 mapinfo_queue.clear ();
259}
260
261bool
262client::mapinfo_try (char *buf)
263{
264 char *token = buf;
265 buf += strlen (buf) + 9;
266
267 // initial map and its origin
268 maptile *map = pl->observe->map;
269 int mapx = pl->ns->mapx / 2 - pl->observe->x;
270 int mapy = pl->ns->mapy / 2 - pl->observe->y;
271 int max_distance = 8; // limit maximum path length to something generous
272
273 while (*buf && map && max_distance)
274 {
275 int dir = *buf++ - '1';
276
277 if (dir >= 0 && dir <= 3)
278 {
279 if (!map->tile_path [dir])
280 map = 0;
281 else if (map->tile_available (dir, false))
282 {
283 maptile *neigh = map->tile_map [dir];
284
285 switch (dir)
286 {
287 case 0: mapy -= neigh->height; break;
288 case 2: mapy += map ->height; break;
289 case 3: mapx -= neigh->width ; break;
290 case 1: mapx += map ->width ; break;
291 }
292
293 map = neigh;
294 --max_distance;
295 }
296 else
297 return 0;
298 }
299 else
300 max_distance = 0;
301 }
302
303 if (!max_distance)
304 send_packet_printf ("mapinfo %s error", token);
305 else if (!map || !map->path)
306 send_packet_printf ("mapinfo %s nomap", token);
307 else
308 {
309 int flags = 0;
310
311 if (map->tile_path[0]) flags |= 1;
312 if (map->tile_path[1]) flags |= 2;
313 if (map->tile_path[2]) flags |= 4;
314 if (map->tile_path[3]) flags |= 8;
315
316 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
317 }
318
319 return 1;
320}
321
322void
323client::mapinfo_queue_run ()
324{
325 if (mapinfo_queue.empty () || !pl)
326 return;
327
328 for (int i = 0; i < mapinfo_queue.size (); ++i)
329 if (mapinfo_try (mapinfo_queue [i]))
330 {
331 free (mapinfo_queue [i]);
332 mapinfo_queue.erase (i);
333 }
334 else
335 ++i;
255} 336}
256 337
257void 338void
258MapInfoCmd (char *buf, int len, player *pl) 339MapInfoCmd (char *buf, int len, player *pl)
259{ 340{
260 // <mapinfo tag spatial tile-path 341 // <mapinfo tag spatial tile-path
261 // >mapinfo tag spatial flags x y w h hash 342 // >mapinfo tag spatial flags x y w h hash
262 343
263 char bigbuf[MAX_BUF], *token;
264
265 token = buf; 344 char *token = buf;
266 // copy token 345
267 if (!(buf = strchr (buf, ' '))) 346 if (!(buf = strchr (buf, ' ')))
268 return; 347 return;
269 348
270 *buf++ = 0;
271
272 if (!strncmp (buf, "spatial ", 8)) 349 if (!strncmp (buf, " spatial ", 9))
273 { 350 {
274 buf += 8; 351 char *copy = strdup (token);
352 copy [buf - token] = 0;
275 353
276 // initial map and its origin 354#if 0
277 maptile *map = pl->ob->map; 355 // this makes only sense when we flush the buffer immediately
278 sint16 dx, dy; 356 if (pl->ns->mapinfo_try (copy))
279 int mapx = pl->ns->mapx / 2 - pl->ob->x; 357 free (copy);
280 int mapy = pl->ns->mapy / 2 - pl->ob->y;
281 int max_distance = 8; // limit maximum path length to something generous
282
283 while (*buf && map && max_distance)
284 {
285 int dir = *buf++;
286
287 switch (dir)
288 {
289 case '1':
290 dx = 0;
291 dy = -1;
292 map = map->xy_find (dx, dy);
293 map && (mapy -= map->height);
294 break;
295 case '2':
296 mapx += map->width;
297 dx = map->width;
298 dy = 0;
299 map = map->xy_find (dx, dy);
300 break;
301 case '3':
302 mapy += map->height;
303 dx = 0;
304 dy = map->height;
305 map = map->xy_find (dx, dy);
306 break;
307 case '4':
308 dx = -1;
309 dy = 0;
310 map = map->xy_find (dx, dy);
311 map && (mapx -= map->width);
312 break;
313 }
314
315 --max_distance;
316 }
317
318 if (!max_distance)
319 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
320 else if (map && map->path[0])
321 {
322 int flags = 0;
323
324 if (map->tile_path[0]) flags |= 1;
325 if (map->tile_path[1]) flags |= 2;
326 if (map->tile_path[2]) flags |= 4;
327 if (map->tile_path[3]) flags |= 8;
328
329 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
330 }
331 else 358 else
332 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 359#endif
360 pl->ns->mapinfo_queue.push_back (copy);
333 } 361 }
334 else 362 else
335 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 363 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
336
337 pl->ns->send_packet (bigbuf);
338} 364}
339 365
340/** This is the Setup cmd */ 366/** This is the Setup cmd */
341void 367void
342SetUp (char *buf, int len, client * ns) 368SetUp (char *buf, int len, client * ns)
… …
471 497
472 ns->send_packet (cmdback); 498 ns->send_packet (cmdback);
473} 499}
474 500
475/** 501/**
476 * client requested an image. send it rate-limited
477 * before flushing.
478 */
479void
480AskFaceCmd (char *buf, int len, client *ns)
481{
482 ns->askface.push_back (atoi (buf));
483}
484
485/**
486 * Tells client the picture it has to use
487 * to smooth a picture number given as argument.
488 */
489void
490AskSmooth (char *buf, int len, client *ns)
491{
492 ns->send_face (atoi (buf));
493 ns->flush_fx ();
494}
495
496/**
497 * This handles the general commands from the client (ie, north, fire, cast, 502 * This handles the general commands from the client (ie, north, fire, cast,
498 * etc.) 503 * etc.)
499 */ 504 */
500void 505void
501PlayerCmd (char *buf, int len, player *pl) 506PlayerCmd (char *buf, int len, player *pl)
… …
522 * commands. 527 * commands.
523 */ 528 */
524 pl->count = 0; 529 pl->count = 0;
525} 530}
526 531
527
528/** 532/**
529 * This handles the general commands from the client (ie, north, fire, cast, 533 * This handles the general commands from the client (ie, north, fire, cast,
530 * etc.). It is a lot like PlayerCmd above, but is called with the 534 * etc.). It is a lot like PlayerCmd above, but is called with the
531 * 'ncom' method which gives more information back to the client so it 535 * 'ncom' method which gives more information back to the client so it
532 * can throttle. 536 * can throttle.
… …
534void 538void
535NewPlayerCmd (char *buf, int len, player *pl) 539NewPlayerCmd (char *buf, int len, player *pl)
536{ 540{
537 if (len <= 6) 541 if (len <= 6)
538 { 542 {
539 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 543 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
540 return; 544 return;
541 } 545 }
542 546
543 uint16 cmdid = net_uint16 ((uint8 *)buf); 547 uint16 cmdid = net_uint16 ((uint8 *)buf);
544 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 548 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
682 * syntax is: move (to) (tag) (nrof) 686 * syntax is: move (to) (tag) (nrof)
683 */ 687 */
684void 688void
685MoveCmd (char *buf, int len, player *pl) 689MoveCmd (char *buf, int len, player *pl)
686{ 690{
687 int vals[3], i; 691 int to, tag, nrof;
688 692
689 /* A little funky here. We only cycle for 2 records, because 693 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
690 * we obviously are not going to find a space after the third
691 * record. Perhaps we should just replace this with a
692 * sscanf?
693 */
694 for (i = 0; i < 2; i++)
695 { 694 {
696 vals[i] = atoi (buf);
697
698 if (!(buf = strchr (buf, ' ')))
699 {
700 LOG (llevError, "Incomplete move command: %s\n", buf); 695 LOG (llevError, "Incomplete move command: %s\n", buf);
701 return; 696 return;
702 }
703
704 buf++;
705 } 697 }
706 698
707 vals[2] = atoi (buf); 699 esrv_move_object (pl->ob, to, tag, nrof);
708
709/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
710 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
711} 700}
712 701
713/****************************************************************************** 702/******************************************************************************
714 * 703 *
715 * Start of commands the server sends to the client. 704 * Start of commands the server sends to the client.
… …
738 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 727 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
739 728
740 if (pl->combat_ob) 729 if (pl->combat_ob)
741 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; 730 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
742 731
732#if 0
743 //TODO: remove this when slot system is working, this is only for debugging 733 //TODO: remove this when slot system is working, this is only for debugging
744 if (pl->ob->chosen_skill) 734 if (pl->ob->chosen_skill)
745 buf << " Skill*: " << pl->ob->chosen_skill->name; 735 buf << " Skill*: " << pl->ob->chosen_skill->name;
736#endif
746 737
747 //TODO: maybe golem should become the current_weapon, quite simply? 738 //TODO: maybe golem should become the current_weapon, quite simply?
748 if (pl->golem) 739 if (pl->golem)
749 buf << " Golem*: " << pl->golem->name; 740 buf << " Golem*: " << pl->golem->name;
750 741
742 buf << '\0';
751 buf.linearise (obuf); 743 buf.linearise (obuf);
752 obuf [buf.size ()] = 0;
753} 744}
754 745
755#define AddIfInt64(Old,New,Type) if (Old != New) {\ 746#define AddIfInt64(Old,New,Type) if (Old != New) {\
756 Old = New; \ 747 Old = New; \
757 sl << uint8 (Type) << uint64 (New); \ 748 sl << uint8 (Type) << uint64 (New); \
… …
794 return; 785 return;
795 786
796 object *ob = pl->observe; 787 object *ob = pl->observe;
797 if (!ob) 788 if (!ob)
798 return; 789 return;
790
791 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
799 792
800 packet sl ("stats"); 793 packet sl ("stats");
801 794
802 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 795 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
803 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 796 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
812 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 805 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
813 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 806 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
814 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 807 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
815 808
816 for (int s = 0; s < NUM_SKILLS; s++) 809 for (int s = 0; s < NUM_SKILLS; s++)
817 if (object *skill = pl->last_skill_ob[s]) 810 if (object *skill = opl->last_skill_ob[s])
818 if (skill->stats.exp != ns->last_skill_exp [s]) 811 if (skill->stats.exp != ns->last_skill_exp [s])
819 { 812 {
820 ns->last_skill_exp [s] = skill->stats.exp; 813 ns->last_skill_exp [s] = skill->stats.exp;
821 814
822 /* Always send along the level if exp changes. This is only 815 /* Always send along the level if exp changes. This is only
… …
837 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); 830 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
838 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 831 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
839 832
840 flags = 0; 833 flags = 0;
841 834
842 if (pl->fire_on) 835 if (opl->fire_on)
843 flags |= SF_FIREON; 836 flags |= SF_FIREON;
844 837
845 if (pl->run_on) 838 if (opl->run_on)
846 flags |= SF_RUNON; 839 flags |= SF_RUNON;
847 840
848 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 841 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
849 842
850 if (ns->sc_version < 1025) 843 if (ns->sc_version < 1025)
… …
864 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 857 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
865 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 858 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
866 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 859 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
867 } 860 }
868 861
869 rangetostring (pl, buf); /* we want use the new fire & run system in new client */ 862 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
870 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 863 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
871 set_title (ob, buf); 864 set_title (ob, buf);
872 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 865 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
873 866
874 /* Only send it away if we have some actual data */ 867 /* Only send it away if we have some actual data */
… …
878 871
879/** 872/**
880 * Tells the client that here is a player it should start using. 873 * Tells the client that here is a player it should start using.
881 */ 874 */
882void 875void
883esrv_new_player (player *pl, uint32 weight) 876esrv_new_player (player *pl)
884{ 877{
878 sint32 weight = pl->ob->client_weight ();
879
885 packet sl ("player"); 880 packet sl ("player");
886 881
887 sl << uint32 (pl->ob->count) 882 sl << uint32 (pl->ob->count)
888 << uint32 (weight) 883 << uint32 (weight)
889 << uint32 (pl->ob->face) 884 << uint32 (pl->ob->face)
… …
956 951
957 if (!ns.faces_sent[face_num]) 952 if (!ns.faces_sent[face_num])
958 if (ob) 953 if (ob)
959 ns.send_faces (ob); 954 ns.send_faces (ob);
960 else 955 else
961 ns.send_face (face_num); 956 ns.send_face (face_num, 10);
962 957
963 sl << uint16 (face_num); 958 sl << uint16 (face_num);
964 return 1; 959 return 1;
965 } 960 }
966 961
… …
1023 1018
1024 /* If player is just joining the game, he isn't here yet, so the map 1019 /* If player is just joining the game, he isn't here yet, so the map
1025 * can get swapped out. If so, don't try to send them a map. All will 1020 * can get swapped out. If so, don't try to send them a map. All will
1026 * be OK once they really log in. 1021 * be OK once they really log in.
1027 */ 1022 */
1028 if (!plmap || plmap->in_memory != MAP_IN_MEMORY) 1023 if (!plmap || plmap->in_memory != MAP_ACTIVE)
1029 return; 1024 return;
1030 1025
1031 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1026 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1032 sint16 nx, ny;
1033 int estartlen, eoldlen; 1027 int estartlen, eoldlen;
1034 uint8 eentrysize; 1028 uint8 eentrysize;
1035 uint16 ewhatstart, ewhatflag; 1029 uint16 ewhatstart, ewhatflag;
1036 uint8 extendedinfos; 1030 uint8 extendedinfos;
1037 maptile *m;
1038 1031
1039 check_map_change (pl); 1032 check_map_change (pl);
1040 prefetch_surrounding_maps (pl->ob); 1033 prefetch_surrounding_maps (pl->ob);
1041 1034
1042 /* do LOS after calls to update_position */ 1035 /* do LOS after calls to update_position */
1036 if (ob != pl->ob)
1037 clear_los (pl);
1043 if (pl->do_los) 1038 else if (pl->do_los)
1044 { 1039 {
1045 update_los (ob); 1040 update_los (ob);
1046 pl->do_los = 0; 1041 pl->do_los = 0;
1047 } 1042 }
1048 1043
… …
1106 max_x = ob->x + (socket.mapx + 1) / 2; 1101 max_x = ob->x + (socket.mapx + 1) / 2;
1107 max_y = ob->y + (socket.mapy + 1) / 2; 1102 max_y = ob->y + (socket.mapy + 1) / 2;
1108 1103
1109 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++) 1104 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1110 { 1105 {
1106 sint16 nx, ny;
1107 maptile *m = 0;
1108
1111 ax = 0; 1109 ax = 0;
1112 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) 1110 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1113 { 1111 {
1112 // check to see if we can simply go one right quickly
1113 ++nx;
1114 if (m && nx >= m->width)
1115 m = 0;
1116
1117 if (!m)
1118 {
1119 nx = x; ny = y; m = plmap;
1120
1121 if (xy_normalise (m, nx, ny))
1122 m->touch ();
1123 else
1124 m = 0;
1125 }
1126
1114 int emask, mask; 1127 int emask, mask;
1115 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1128 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1116 1129
1117 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1130 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1118 1131
1119 /* If the coordinates are not valid, or it is too dark to see, 1132 /* If the coordinates are not valid, or it is too dark to see,
1120 * we tell the client as such 1133 * we tell the client as such
1121 */ 1134 */
1122 nx = x;
1123 ny = y;
1124 m = get_map_from_coord (plmap, &nx, &ny);
1125
1126 if (!m) 1135 if (!m)
1127 { 1136 {
1128 /* space is out of map. Update space and clear values 1137 /* space is out of map. Update space and clear values
1129 * if this hasn't already been done. If the space is out 1138 * if this hasn't already been done. If the space is out
1130 * of the map, it shouldn't have a head 1139 * of the map, it shouldn't have a head
… …
1136 } 1145 }
1137 1146
1138 continue; 1147 continue;
1139 } 1148 }
1140 1149
1141 m->touch ();
1142
1143 int d = ob->contr->blocked_los[ax][ay]; 1150 int d = pl->blocked_los[ax][ay];
1144 1151
1145 if (d > 3) 1152 if (d > 3)
1146 { 1153 {
1147 1154
1148 int need_send = 0, count; 1155 int need_send = 0, count;
… …
1211 } 1218 }
1212 1219
1213 lastcell.count = d; 1220 lastcell.count = d;
1214 1221
1215 mapspace &ms = m->at (nx, ny); 1222 mapspace &ms = m->at (nx, ny);
1223 ms.update ();
1216 1224
1217 if (socket.extmap) 1225 if (socket.extmap)
1218 { 1226 {
1219 uint8 stat_hp = 0; 1227 uint8 stat_hp = 0;
1220 uint8 stat_width = 0; 1228 uint8 stat_width = 0;
1221 uint8 flags = 0; 1229 uint8 flags = 0;
1222 tag_t player = 0; 1230 tag_t player = 0;
1223 1231
1224 // send hp information, if applicable 1232 // send hp information, if applicable
1225 if (object *op = ms.faces_obj [0]) 1233 if (object *op = ms.faces_obj [0])
1234 if (op->is_head () && !op->invisible)
1226 { 1235 {
1227 if (op->head || op->invisible) 1236 if (op->stats.maxhp > op->stats.hp
1228 ; // do not show 1237 && op->stats.maxhp > 0
1229 else if (op->type == PLAYER 1238 && (op->type == PLAYER
1239 || op->type == DOOR // does not work, have maxhp 0
1230 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1240 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)))
1231 {
1232 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1233 { 1241 {
1234 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1242 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1235 stat_width = op->arch->tail_x; 1243 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1236 } 1244 }
1237 }
1238 1245
1239 if (op->msg && op->msg[0] == '@') 1246 if (op->msg && op->msg[0] == '@')
1240 flags |= 1; 1247 flags |= 1;
1241 1248
1242 if (op->type == PLAYER && op != ob) 1249 if (op->type == PLAYER && op != ob)
1243 player = op->count; 1250 player = op->count;
1244 } 1251 }
1245 1252
1246 if (lastcell.stat_hp != stat_hp) 1253 if (lastcell.stat_hp != stat_hp)
1247 { 1254 {
1248 lastcell.stat_hp = stat_hp; 1255 lastcell.stat_hp = stat_hp;
1249 1256
… …
1308 } 1315 }
1309 } 1316 }
1310 /* Top face */ 1317 /* Top face */
1311 else if (update_space (sl, socket, ms, lastcell, 0)) 1318 else if (update_space (sl, socket, ms, lastcell, 0))
1312 mask |= 0x1; 1319 mask |= 0x1;
1313
1314 1320
1315 /* Check to see if we are in fact sending anything for this 1321 /* Check to see if we are in fact sending anything for this
1316 * space by checking the mask. If so, update the mask. 1322 * space by checking the mask. If so, update the mask.
1317 * if not, reset the len to that from before adding the mask 1323 * if not, reset the len to that from before adding the mask
1318 * value, so we don't send those bits. 1324 * value, so we don't send those bits.
… …
1401 sl << "replyinfo skill_info\n"; 1407 sl << "replyinfo skill_info\n";
1402 1408
1403 for (int i = 1; i < NUM_SKILLS; i++) 1409 for (int i = 1; i < NUM_SKILLS; i++)
1404 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1410 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1405 1411
1406 if (sl.length () >= MAXSOCKBUF) 1412 if (sl.length () > MAXSOCKBUF)
1407 { 1413 {
1408 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1414 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1409 fatal (0); 1415 fatal (0);
1410 } 1416 }
1411 1417
… …
1424 sl << "replyinfo spell_paths\n"; 1430 sl << "replyinfo spell_paths\n";
1425 1431
1426 for (int i = 0; i < NRSPELLPATHS; i++) 1432 for (int i = 0; i < NRSPELLPATHS; i++)
1427 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1433 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1428 1434
1429 if (sl.length () >= MAXSOCKBUF) 1435 if (sl.length () > MAXSOCKBUF)
1430 { 1436 {
1431 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1437 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1432 fatal (0); 1438 fatal (0);
1433 } 1439 }
1434 1440
… …
1542 if (!spell->face) 1548 if (!spell->face)
1543 { 1549 {
1544 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1550 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1545 spell->face = face_find ("burnout.x11", blank_face); 1551 spell->face = face_find ("burnout.x11", blank_face);
1546 } 1552 }
1553
1554 pl->ns->send_face (spell->face);
1547 1555
1548 /* send the current values */ 1556 /* send the current values */
1549 sl << uint32 (spell->count) 1557 sl << uint32 (spell->count)
1550 << uint16 (spell->level) 1558 << uint16 (spell->level)
1551 << uint16 (spell->casting_time) 1559 << uint16 (spell->casting_time)
… …
1587 * bytes and 3 strings (because that is the spec) so we need to 1595 * bytes and 3 strings (because that is the spec) so we need to
1588 * check that the length of those 3 strings, plus the 23 bytes, 1596 * check that the length of those 3 strings, plus the 23 bytes,
1589 * won't take us over the length limit for the socket, if it does, 1597 * won't take us over the length limit for the socket, if it does,
1590 * we need to send what we already have, and restart packet formation 1598 * we need to send what we already have, and restart packet formation
1591 */ 1599 */
1600 if (spell->type != SPELL)
1601 continue;
1602
1592 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1603 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1593 * to show add_spell is 26 bytes + 2 strings. However, the overun 1604 * to show add_spell is 26 bytes + 2 strings. However, the overun
1594 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1605 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1595 * like it will fix this 1606 * like it will fix this
1596 */ 1607 */
1597 if (spell->type != SPELL)
1598 continue;
1599
1600 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1608 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1601 { 1609 {
1610 pl->ns->flush_fx ();
1602 pl->ns->send_packet (sl); 1611 pl->ns->send_packet (sl);
1603 1612
1604 sl.reset (); 1613 sl.reset ();
1605 sl << "addspell "; 1614 sl << "addspell ";
1606 } 1615 }
… …
1614 return; 1623 return;
1615 } 1624 }
1616 else 1625 else
1617 append_spell (pl, sl, spell); 1626 append_spell (pl, sl, spell);
1618 1627
1619 if (sl.length () >= MAXSOCKBUF) 1628 if (sl.length () > MAXSOCKBUF)
1620 { 1629 {
1621 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1630 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1622 fatal (0); 1631 fatal (0);
1623 } 1632 }
1624 1633
1625 /* finally, we can send the packet */ 1634 /* finally, we can send the packet */
1635 pl->ns->flush_fx ();
1626 pl->ns->send_packet (sl); 1636 pl->ns->send_packet (sl);
1627} 1637}
1628 1638

Diff Legend

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