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.104 by root, Tue Jun 5 13:05:03 2007 UTC vs.
Revision 1.131 by root, Tue May 20 13:25:55 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)
140 pl->ns->send_packet ("newmap"); 141 pl->ns->send_packet ("newmap");
141 142
142 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 }
143} 170}
144 171
145/** check for map/region change and send new map data */ 172/** check for map/region change and send new map data */
146static void 173static void
147check_map_change (player *pl) 174check_map_change (player *pl)
148{ 175{
149 client &socket = *pl->ns; 176 client &socket = *pl->ns;
150 object *ob = pl->observe; 177 object *ob = pl->observe;
151 178
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;
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
152 if (socket.current_map != ob->map || socket.force_newmap) 206 if (socket.current_map != ob->map || socket.force_newmap)
153 { 207 {
154 clear_map (pl); 208 clear_map (pl);
155 socket.current_map = ob->map; 209 socket.current_map = ob->map;
156 210 send_map_info (pl);
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]) flags |= 1;
164 if (ob->map->tile_path[1]) flags |= 2;
165 if (ob->map->tile_path[2]) flags |= 4;
166 if (ob->map->tile_path[3]) flags |= 8;
167
168 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
169 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
170 ob->map->width, ob->map->height, &ob->map->path);
171 }
172 else
173 socket.send_packet ("mapinfo current");
174 }
175 } 211 }
176 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)
177 { 213 {
178 int dx = ob->x - socket.current_x; 214 int dx = ob->x - socket.current_x;
179 int dy = ob->y - socket.current_y; 215 int dy = ob->y - socket.current_y;
… …
187 } 223 }
188 } 224 }
189 225
190 socket.current_x = ob->x; 226 socket.current_x = ob->x;
191 socket.current_y = ob->y; 227 socket.current_y = ob->y;
192
193 region *reg = ob->region ();
194 if (socket.current_region != reg)
195 {
196 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} 228}
200 229
201/** 230/**
202 * RequestInfo is sort of a meta command. There is some specific 231 * RequestInfo is sort of a meta command. There is some specific
203 * request of information, but we call other functions to provide 232 * request of information, but we call other functions to provide
204 * that information. 233 * that information.
205 */ 234 */
206void 235void
207RequestInfo (char *buf, int len, client * ns) 236RequestInfo (char *buf, int len, client *ns)
208{ 237{
209 char *params = NULL, *cp; 238 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 239
222 /* find the first space, make it null, and update the 240 /* find the first space, make it null, and update the
223 * params pointer. 241 * params pointer.
224 */ 242 */
225 for (cp = buf; *cp != '\0'; cp++) 243 for (params = buf; *params; params++)
226 if (*cp == ' ') 244 if (*params == ' ')
227 { 245 {
228 *cp = '\0';
229 params = cp + 1; 246 *params++ = 0;
230 break; 247 break;
231 } 248 }
232 249
233 if (!strcmp (buf, "image_info")) 250 if (!strcmp (buf, "image_info"))
234 send_image_info (ns, params); 251 send_image_info (ns, params);
… …
237 else if (!strcmp (buf, "skill_info")) 254 else if (!strcmp (buf, "skill_info"))
238 send_skill_info (ns, params); 255 send_skill_info (ns, params);
239 else if (!strcmp (buf, "spell_paths")) 256 else if (!strcmp (buf, "spell_paths"))
240 send_spell_paths (ns, params); 257 send_spell_paths (ns, params);
241 else 258 else
242 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 }
243} 266}
244 267
245void 268void
246ExtCmd (char *buf, int len, player *pl) 269ExtCmd (char *buf, int len, player *pl)
247{ 270{
… …
250 273
251void 274void
252ExtiCmd (char *buf, int len, client *ns) 275ExtiCmd (char *buf, int len, client *ns)
253{ 276{
254 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;
255} 364}
256 365
257void 366void
258MapInfoCmd (char *buf, int len, player *pl) 367MapInfoCmd (char *buf, int len, player *pl)
259{ 368{
260 // <mapinfo tag spatial tile-path 369 // <mapinfo tag spatial tile-path
261 // >mapinfo tag spatial flags x y w h hash 370 // >mapinfo tag spatial flags x y w h hash
262 371
263 char bigbuf[MAX_BUF], *token;
264
265 token = buf; 372 char *token = buf;
266 // copy token 373
267 if (!(buf = strchr (buf, ' '))) 374 if (!(buf = strchr (buf, ' ')))
268 return; 375 return;
269 376
270 *buf++ = 0;
271
272 if (!strncmp (buf, "spatial ", 8)) 377 if (!strncmp (buf, " spatial ", 9))
273 { 378 {
274 buf += 8; 379 char *copy = strdup (token);
380 copy [buf - token] = 0;
275 381
276 // initial map and its origin 382#if 0
277 maptile *map = pl->ob->map; 383 // this makes only sense when we flush the buffer immediately
278 sint16 dx, dy; 384 if (pl->ns->mapinfo_try (copy))
279 int mapx = pl->ns->mapx / 2 - pl->ob->x; 385 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 386 else
332 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 387#endif
388 pl->ns->mapinfo_queue.push_back (copy);
333 } 389 }
334 else 390 else
335 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 391 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
336
337 pl->ns->send_packet (bigbuf);
338} 392}
339 393
340/** This is the Setup cmd */ 394/** This is the Setup cmd */
341void 395void
342SetUp (char *buf, int len, client * ns) 396SetUp (char *buf, int len, client * ns)
… …
471 525
472 ns->send_packet (cmdback); 526 ns->send_packet (cmdback);
473} 527}
474 528
475/** 529/**
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, 530 * This handles the general commands from the client (ie, north, fire, cast,
498 * etc.) 531 * etc.)
499 */ 532 */
500void 533void
501PlayerCmd (char *buf, int len, player *pl) 534PlayerCmd (char *buf, int len, player *pl)
… …
533void 566void
534NewPlayerCmd (char *buf, int len, player *pl) 567NewPlayerCmd (char *buf, int len, player *pl)
535{ 568{
536 if (len <= 6) 569 if (len <= 6)
537 { 570 {
538 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);
539 return; 572 return;
540 } 573 }
541 574
542 uint16 cmdid = net_uint16 ((uint8 *)buf); 575 uint16 cmdid = net_uint16 ((uint8 *)buf);
543 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 576 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
681 * syntax is: move (to) (tag) (nrof) 714 * syntax is: move (to) (tag) (nrof)
682 */ 715 */
683void 716void
684MoveCmd (char *buf, int len, player *pl) 717MoveCmd (char *buf, int len, player *pl)
685{ 718{
686 int vals[3], i; 719 int to, tag, nrof;
687 720
688 /* A little funky here. We only cycle for 2 records, because 721 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
689 * we obviously are not going to find a space after the third
690 * record. Perhaps we should just replace this with a
691 * sscanf?
692 */
693 for (i = 0; i < 2; i++)
694 { 722 {
695 vals[i] = atoi (buf);
696
697 if (!(buf = strchr (buf, ' ')))
698 {
699 LOG (llevError, "Incomplete move command: %s\n", buf); 723 LOG (llevError, "Incomplete move command: %s\n", buf);
700 return; 724 return;
701 }
702
703 buf++;
704 } 725 }
705 726
706 vals[2] = atoi (buf); 727 esrv_move_object (pl->ob, to, tag, nrof);
707
708/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
709 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
710} 728}
711 729
712/****************************************************************************** 730/******************************************************************************
713 * 731 *
714 * Start of commands the server sends to the client. 732 * Start of commands the server sends to the client.
… …
747 765
748 //TODO: maybe golem should become the current_weapon, quite simply? 766 //TODO: maybe golem should become the current_weapon, quite simply?
749 if (pl->golem) 767 if (pl->golem)
750 buf << " Golem*: " << pl->golem->name; 768 buf << " Golem*: " << pl->golem->name;
751 769
770 buf << '\0';
752 buf.linearise (obuf); 771 buf.linearise (obuf);
753 obuf [buf.size ()] = 0;
754} 772}
755 773
756#define AddIfInt64(Old,New,Type) if (Old != New) {\ 774#define AddIfInt64(Old,New,Type) if (Old != New) {\
757 Old = New; \ 775 Old = New; \
758 sl << uint8 (Type) << uint64 (New); \ 776 sl << uint8 (Type) << uint64 (New); \
… …
795 return; 813 return;
796 814
797 object *ob = pl->observe; 815 object *ob = pl->observe;
798 if (!ob) 816 if (!ob)
799 return; 817 return;
818
819 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
800 820
801 packet sl ("stats"); 821 packet sl ("stats");
802 822
803 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 823 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
804 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 824 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
813 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 833 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
814 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 834 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
815 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 835 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
816 836
817 for (int s = 0; s < NUM_SKILLS; s++) 837 for (int s = 0; s < NUM_SKILLS; s++)
818 if (object *skill = pl->last_skill_ob[s]) 838 if (object *skill = opl->last_skill_ob[s])
819 if (skill->stats.exp != ns->last_skill_exp [s]) 839 if (skill->stats.exp != ns->last_skill_exp [s])
820 { 840 {
821 ns->last_skill_exp [s] = skill->stats.exp; 841 ns->last_skill_exp [s] = skill->stats.exp;
822 842
823 /* Always send along the level if exp changes. This is only 843 /* Always send along the level if exp changes. This is only
… …
838 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); 858 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
839 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);
840 860
841 flags = 0; 861 flags = 0;
842 862
843 if (pl->fire_on) 863 if (opl->fire_on)
844 flags |= SF_FIREON; 864 flags |= SF_FIREON;
845 865
846 if (pl->run_on) 866 if (opl->run_on)
847 flags |= SF_RUNON; 867 flags |= SF_RUNON;
848 868
849 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 869 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
850 870
851 if (ns->sc_version < 1025) 871 if (ns->sc_version < 1025)
… …
865 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);
866 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);
867 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);
868 } 888 }
869 889
870 rangetostring (pl, 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 */
871 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 891 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
872 set_title (ob, buf); 892 set_title (ob, buf);
873 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 893 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
874 894
875 /* Only send it away if we have some actual data */ 895 /* Only send it away if we have some actual data */
… …
879 899
880/** 900/**
881 * 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.
882 */ 902 */
883void 903void
884esrv_new_player (player *pl, uint32 weight) 904esrv_new_player (player *pl)
885{ 905{
906 sint32 weight = pl->ob->client_weight ();
907
886 packet sl ("player"); 908 packet sl ("player");
887 909
888 sl << uint32 (pl->ob->count) 910 sl << uint32 (pl->ob->count)
889 << uint32 (weight) 911 << uint32 (weight)
890 << uint32 (pl->ob->face) 912 << uint32 (pl->ob->face)
… …
957 979
958 if (!ns.faces_sent[face_num]) 980 if (!ns.faces_sent[face_num])
959 if (ob) 981 if (ob)
960 ns.send_faces (ob); 982 ns.send_faces (ob);
961 else 983 else
962 ns.send_face (face_num); 984 ns.send_face (face_num, 10);
963 985
964 sl << uint16 (face_num); 986 sl << uint16 (face_num);
965 return 1; 987 return 1;
966 } 988 }
967 989
… …
1024 1046
1025 /* If player is just joining the game, he isn't here yet, so the map 1047 /* If player is just joining the game, he isn't here yet, so the map
1026 * can get swapped out. If so, don't try to send them a map. All will 1048 * can get swapped out. If so, don't try to send them a map. All will
1027 * be OK once they really log in. 1049 * be OK once they really log in.
1028 */ 1050 */
1029 if (!plmap || plmap->in_memory != MAP_IN_MEMORY) 1051 if (!plmap || plmap->in_memory != MAP_ACTIVE)
1030 return; 1052 return;
1031 1053
1032 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1054 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1033 sint16 nx, ny;
1034 int estartlen, eoldlen; 1055 int estartlen, eoldlen;
1035 uint8 eentrysize; 1056 uint8 eentrysize;
1036 uint16 ewhatstart, ewhatflag; 1057 uint16 ewhatstart, ewhatflag;
1037 uint8 extendedinfos; 1058 uint8 extendedinfos;
1038 maptile *m;
1039 1059
1040 check_map_change (pl); 1060 check_map_change (pl);
1041 prefetch_surrounding_maps (pl->ob); 1061 prefetch_surrounding_maps (pl->ob);
1042 1062
1043 /* do LOS after calls to update_position */ 1063 /* do LOS after calls to update_position */
… …
1109 max_x = ob->x + (socket.mapx + 1) / 2; 1129 max_x = ob->x + (socket.mapx + 1) / 2;
1110 max_y = ob->y + (socket.mapy + 1) / 2; 1130 max_y = ob->y + (socket.mapy + 1) / 2;
1111 1131
1112 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++) 1132 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1113 { 1133 {
1134 sint16 nx, ny;
1135 maptile *m = 0;
1136
1114 ax = 0; 1137 ax = 0;
1115 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) 1138 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1116 { 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
1117 int emask, mask; 1155 int emask, mask;
1118 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1156 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1119 1157
1120 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1158 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1121 1159
1122 /* 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,
1123 * we tell the client as such 1161 * we tell the client as such
1124 */ 1162 */
1125 nx = x;
1126 ny = y;
1127 m = get_map_from_coord (plmap, &nx, &ny);
1128
1129 if (!m) 1163 if (!m)
1130 { 1164 {
1131 /* space is out of map. Update space and clear values 1165 /* space is out of map. Update space and clear values
1132 * 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
1133 * of the map, it shouldn't have a head 1167 * of the map, it shouldn't have a head
… …
1139 } 1173 }
1140 1174
1141 continue; 1175 continue;
1142 } 1176 }
1143 1177
1144 m->touch ();
1145
1146 int d = pl->blocked_los[ax][ay]; 1178 int d = pl->blocked_los[ax][ay];
1147 1179
1148 if (d > 3) 1180 if (d > 3)
1149 { 1181 {
1150 1182
… …
1214 } 1246 }
1215 1247
1216 lastcell.count = d; 1248 lastcell.count = d;
1217 1249
1218 mapspace &ms = m->at (nx, ny); 1250 mapspace &ms = m->at (nx, ny);
1251 ms.update ();
1219 1252
1220 if (socket.extmap) 1253 if (socket.extmap)
1221 { 1254 {
1222 uint8 stat_hp = 0; 1255 uint8 stat_hp = 0;
1223 uint8 stat_width = 0; 1256 uint8 stat_width = 0;
1224 uint8 flags = 0; 1257 uint8 flags = 0;
1225 tag_t player = 0; 1258 tag_t player = 0;
1226 1259
1227 // send hp information, if applicable 1260 // send hp information, if applicable
1228 if (object *op = ms.faces_obj [0]) 1261 if (object *op = ms.faces_obj [0])
1262 if (op->is_head () && !op->invisible)
1229 { 1263 {
1230 if (op->head || op->invisible) 1264 if (op->stats.maxhp > op->stats.hp
1231 ; // do not show 1265 && op->stats.maxhp > 0
1232 else if (op->type == PLAYER 1266 && (op->type == PLAYER
1267 || op->type == DOOR // does not work, have maxhp 0
1233 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1268 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)))
1234 {
1235 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1236 { 1269 {
1237 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1270 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1238 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge 1271 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1239 } 1272 }
1240 }
1241 1273
1242 if (op->msg && op->msg[0] == '@') 1274 if (op->msg && op->msg[0] == '@')
1243 flags |= 1; 1275 flags |= 1;
1244 1276
1245 if (op->type == PLAYER && op != ob) 1277 if (op->type == PLAYER && op != ob)
1246 player = op->count; 1278 player = op->count;
1247 } 1279 }
1248 1280
1249 if (lastcell.stat_hp != stat_hp) 1281 if (lastcell.stat_hp != stat_hp)
1250 { 1282 {
1251 lastcell.stat_hp = stat_hp; 1283 lastcell.stat_hp = stat_hp;
1252 1284
… …
1403 sl << "replyinfo skill_info\n"; 1435 sl << "replyinfo skill_info\n";
1404 1436
1405 for (int i = 1; i < NUM_SKILLS; i++) 1437 for (int i = 1; i < NUM_SKILLS; i++)
1406 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1438 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1407 1439
1408 if (sl.length () >= MAXSOCKBUF) 1440 if (sl.length () > MAXSOCKBUF)
1409 { 1441 {
1410 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1442 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1411 fatal (0); 1443 fatal (0);
1412 } 1444 }
1413 1445
… …
1426 sl << "replyinfo spell_paths\n"; 1458 sl << "replyinfo spell_paths\n";
1427 1459
1428 for (int i = 0; i < NRSPELLPATHS; i++) 1460 for (int i = 0; i < NRSPELLPATHS; i++)
1429 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1461 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1430 1462
1431 if (sl.length () >= MAXSOCKBUF) 1463 if (sl.length () > MAXSOCKBUF)
1432 { 1464 {
1433 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1465 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1434 fatal (0); 1466 fatal (0);
1435 } 1467 }
1436 1468
… …
1544 if (!spell->face) 1576 if (!spell->face)
1545 { 1577 {
1546 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1578 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1547 spell->face = face_find ("burnout.x11", blank_face); 1579 spell->face = face_find ("burnout.x11", blank_face);
1548 } 1580 }
1581
1582 pl->ns->send_face (spell->face);
1549 1583
1550 /* send the current values */ 1584 /* send the current values */
1551 sl << uint32 (spell->count) 1585 sl << uint32 (spell->count)
1552 << uint16 (spell->level) 1586 << uint16 (spell->level)
1553 << uint16 (spell->casting_time) 1587 << uint16 (spell->casting_time)
… …
1589 * bytes and 3 strings (because that is the spec) so we need to 1623 * bytes and 3 strings (because that is the spec) so we need to
1590 * check that the length of those 3 strings, plus the 23 bytes, 1624 * check that the length of those 3 strings, plus the 23 bytes,
1591 * won't take us over the length limit for the socket, if it does, 1625 * won't take us over the length limit for the socket, if it does,
1592 * we need to send what we already have, and restart packet formation 1626 * we need to send what we already have, and restart packet formation
1593 */ 1627 */
1628 if (spell->type != SPELL)
1629 continue;
1630
1594 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1631 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1595 * to show add_spell is 26 bytes + 2 strings. However, the overun 1632 * to show add_spell is 26 bytes + 2 strings. However, the overun
1596 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1633 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1597 * like it will fix this 1634 * like it will fix this
1598 */ 1635 */
1599 if (spell->type != SPELL)
1600 continue;
1601
1602 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1636 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1603 { 1637 {
1638 pl->ns->flush_fx ();
1604 pl->ns->send_packet (sl); 1639 pl->ns->send_packet (sl);
1605 1640
1606 sl.reset (); 1641 sl.reset ();
1607 sl << "addspell "; 1642 sl << "addspell ";
1608 } 1643 }
… …
1616 return; 1651 return;
1617 } 1652 }
1618 else 1653 else
1619 append_spell (pl, sl, spell); 1654 append_spell (pl, sl, spell);
1620 1655
1621 if (sl.length () >= MAXSOCKBUF) 1656 if (sl.length () > MAXSOCKBUF)
1622 { 1657 {
1623 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1658 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1624 fatal (0); 1659 fatal (0);
1625 } 1660 }
1626 1661
1627 /* finally, we can send the packet */ 1662 /* finally, we can send the packet */
1663 pl->ns->flush_fx ();
1628 pl->ns->send_packet (sl); 1664 pl->ns->send_packet (sl);
1629} 1665}
1630 1666

Diff Legend

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