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.115 by root, Wed Jul 11 15:57:31 2007 UTC vs.
Revision 1.130 by root, Tue May 20 03:14:19 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 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 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 3 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,
… …
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, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * 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>
22 */ 22 */
23 23
24/** 24/**
25 * \file 25 * \file
26 * Client handling. 26 * Client handling.
… …
129} 129}
130 130
131static void 131static void
132clear_map (player *pl) 132clear_map (player *pl)
133{ 133{
134 pl->ns->mapinfo_queue_clear ();
135
134 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 136 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
135 137
136 pl->ns->force_newmap = false; 138 pl->ns->force_newmap = false;
137 139
138 if (pl->ns->newmapcmd == 1) 140 if (pl->ns->newmapcmd == 1)
… …
145static void 147static void
146check_map_change (player *pl) 148check_map_change (player *pl)
147{ 149{
148 client &socket = *pl->ns; 150 client &socket = *pl->ns;
149 object *ob = pl->observe; 151 object *ob = pl->observe;
152
153 // first try to aovid a full newmap on tiled map scrolls
154 if (socket.current_map != ob->map)
155 {
156 rv_vector rv;
157
158 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
159
160 // manhattan distance is very handy here
161 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
162 {
163 socket.current_map = ob->map;
164 socket.current_x = ob->x;
165 socket.current_y = ob->y;
166
167 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
168 socket.floorbox_reset ();
169 }
170 }
150 171
151 if (socket.current_map != ob->map || socket.force_newmap) 172 if (socket.current_map != ob->map || socket.force_newmap)
152 { 173 {
153 clear_map (pl); 174 clear_map (pl);
154 socket.current_map = ob->map; 175 socket.current_map = ob->map;
… …
246{ 267{
247 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 268 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
248} 269}
249 270
250void 271void
272client::mapinfo_queue_clear ()
273{
274 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
275 free (*i);
276
277 mapinfo_queue.clear ();
278}
279
280bool
281client::mapinfo_try (char *buf)
282{
283 char *token = buf;
284 buf += strlen (buf) + 9;
285
286 // initial map and its origin
287 maptile *map = pl->observe->map;
288 int mapx = pl->ns->mapx / 2 - pl->observe->x;
289 int mapy = pl->ns->mapy / 2 - pl->observe->y;
290 int max_distance = 8; // limit maximum path length to something generous
291
292 while (*buf && map && max_distance)
293 {
294 int dir = *buf++ - '1';
295
296 if (dir >= 0 && dir <= 3)
297 {
298 if (!map->tile_path [dir])
299 map = 0;
300 else if (map->tile_available (dir, false))
301 {
302 maptile *neigh = map->tile_map [dir];
303
304 switch (dir)
305 {
306 case 0: mapy -= neigh->height; break;
307 case 2: mapy += map ->height; break;
308 case 3: mapx -= neigh->width ; break;
309 case 1: mapx += map ->width ; break;
310 }
311
312 map = neigh;
313 --max_distance;
314 }
315 else
316 return 0;
317 }
318 else
319 max_distance = 0;
320 }
321
322 if (!max_distance)
323 send_packet_printf ("mapinfo %s error", token);
324 else if (!map || !map->path)
325 send_packet_printf ("mapinfo %s nomap", token);
326 else
327 {
328 int flags = 0;
329
330 if (map->tile_path[0]) flags |= 1;
331 if (map->tile_path[1]) flags |= 2;
332 if (map->tile_path[2]) flags |= 4;
333 if (map->tile_path[3]) flags |= 8;
334
335 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
336 }
337
338 return 1;
339}
340
341void
342client::mapinfo_queue_run ()
343{
344 if (mapinfo_queue.empty () || !pl)
345 return;
346
347 for (int i = 0; i < mapinfo_queue.size (); ++i)
348 if (mapinfo_try (mapinfo_queue [i]))
349 {
350 free (mapinfo_queue [i]);
351 mapinfo_queue.erase (i);
352 }
353 else
354 ++i;
355}
356
357void
251MapInfoCmd (char *buf, int len, player *pl) 358MapInfoCmd (char *buf, int len, player *pl)
252{ 359{
253 // <mapinfo tag spatial tile-path 360 // <mapinfo tag spatial tile-path
254 // >mapinfo tag spatial flags x y w h hash 361 // >mapinfo tag spatial flags x y w h hash
255 362
256 char bigbuf[MAX_BUF], *token;
257
258 token = buf; 363 char *token = buf;
259 // copy token 364
260 if (!(buf = strchr (buf, ' '))) 365 if (!(buf = strchr (buf, ' ')))
261 return; 366 return;
262 367
263 *buf++ = 0;
264
265 if (!strncmp (buf, "spatial ", 8)) 368 if (!strncmp (buf, " spatial ", 9))
266 { 369 {
267 buf += 8; 370 char *copy = strdup (token);
371 copy [buf - token] = 0;
268 372
269 // initial map and its origin 373#if 0
270 maptile *map = pl->ob->map; 374 // this makes only sense when we flush the buffer immediately
271 sint16 dx, dy; 375 if (pl->ns->mapinfo_try (copy))
272 int mapx = pl->ns->mapx / 2 - pl->ob->x; 376 free (copy);
273 int mapy = pl->ns->mapy / 2 - pl->ob->y;
274 int max_distance = 8; // limit maximum path length to something generous
275
276 while (*buf && map && max_distance)
277 {
278 int dir = *buf++;
279
280 switch (dir)
281 {
282 case '1':
283 dx = 0;
284 dy = -1;
285 map = map->xy_find (dx, dy);
286 map && (mapy -= map->height);
287 break;
288 case '2':
289 mapx += map->width;
290 dx = map->width;
291 dy = 0;
292 map = map->xy_find (dx, dy);
293 break;
294 case '3':
295 mapy += map->height;
296 dx = 0;
297 dy = map->height;
298 map = map->xy_find (dx, dy);
299 break;
300 case '4':
301 dx = -1;
302 dy = 0;
303 map = map->xy_find (dx, dy);
304 map && (mapx -= map->width);
305 break;
306 }
307
308 --max_distance;
309 }
310
311 if (!max_distance)
312 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
313 else if (map && map->path[0])
314 {
315 int flags = 0;
316
317 if (map->tile_path[0]) flags |= 1;
318 if (map->tile_path[1]) flags |= 2;
319 if (map->tile_path[2]) flags |= 4;
320 if (map->tile_path[3]) flags |= 8;
321
322 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
323 }
324 else 377 else
325 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 378#endif
379 pl->ns->mapinfo_queue.push_back (copy);
326 } 380 }
327 else 381 else
328 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 382 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
329
330 pl->ns->send_packet (bigbuf);
331} 383}
332 384
333/** This is the Setup cmd */ 385/** This is the Setup cmd */
334void 386void
335SetUp (char *buf, int len, client * ns) 387SetUp (char *buf, int len, client * ns)
… …
653 * syntax is: move (to) (tag) (nrof) 705 * syntax is: move (to) (tag) (nrof)
654 */ 706 */
655void 707void
656MoveCmd (char *buf, int len, player *pl) 708MoveCmd (char *buf, int len, player *pl)
657{ 709{
658 int vals[3], i; 710 int to, tag, nrof;
659 711
660 /* A little funky here. We only cycle for 2 records, because 712 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
661 * we obviously are not going to find a space after the third
662 * record. Perhaps we should just replace this with a
663 * sscanf?
664 */
665 for (i = 0; i < 2; i++)
666 { 713 {
667 vals[i] = atoi (buf);
668
669 if (!(buf = strchr (buf, ' ')))
670 {
671 LOG (llevError, "Incomplete move command: %s\n", buf); 714 LOG (llevError, "Incomplete move command: %s\n", buf);
672 return; 715 return;
673 }
674
675 buf++;
676 } 716 }
677 717
678 vals[2] = atoi (buf); 718 esrv_move_object (pl->ob, to, tag, nrof);
679
680/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
681 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
682} 719}
683 720
684/****************************************************************************** 721/******************************************************************************
685 * 722 *
686 * Start of commands the server sends to the client. 723 * Start of commands the server sends to the client.
… …
853 890
854/** 891/**
855 * Tells the client that here is a player it should start using. 892 * Tells the client that here is a player it should start using.
856 */ 893 */
857void 894void
858esrv_new_player (player *pl, uint32 weight) 895esrv_new_player (player *pl)
859{ 896{
897 sint32 weight = pl->ob->client_weight ();
898
860 packet sl ("player"); 899 packet sl ("player");
861 900
862 sl << uint32 (pl->ob->count) 901 sl << uint32 (pl->ob->count)
863 << uint32 (weight) 902 << uint32 (weight)
864 << uint32 (pl->ob->face) 903 << uint32 (pl->ob->face)
… …
931 970
932 if (!ns.faces_sent[face_num]) 971 if (!ns.faces_sent[face_num])
933 if (ob) 972 if (ob)
934 ns.send_faces (ob); 973 ns.send_faces (ob);
935 else 974 else
936 ns.send_face (face_num); 975 ns.send_face (face_num, 10);
937 976
938 sl << uint16 (face_num); 977 sl << uint16 (face_num);
939 return 1; 978 return 1;
940 } 979 }
941 980
… …
998 1037
999 /* If player is just joining the game, he isn't here yet, so the map 1038 /* If player is just joining the game, he isn't here yet, so the map
1000 * can get swapped out. If so, don't try to send them a map. All will 1039 * can get swapped out. If so, don't try to send them a map. All will
1001 * be OK once they really log in. 1040 * be OK once they really log in.
1002 */ 1041 */
1003 if (!plmap || plmap->in_memory != MAP_IN_MEMORY) 1042 if (!plmap || plmap->in_memory != MAP_ACTIVE)
1004 return; 1043 return;
1005 1044
1006 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1045 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1007 int estartlen, eoldlen; 1046 int estartlen, eoldlen;
1008 uint8 eentrysize; 1047 uint8 eentrysize;
… …
1096 1135
1097 if (!m) 1136 if (!m)
1098 { 1137 {
1099 nx = x; ny = y; m = plmap; 1138 nx = x; ny = y; m = plmap;
1100 1139
1101 if (!xy_normalise (m, nx, ny)) 1140 if (xy_normalise (m, nx, ny))
1141 m->touch ();
1142 else
1102 m = 0; 1143 m = 0;
1103 } 1144 }
1104 1145
1105 int emask, mask; 1146 int emask, mask;
1106 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1147 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
… …
1123 } 1164 }
1124 1165
1125 continue; 1166 continue;
1126 } 1167 }
1127 1168
1128 m->touch ();
1129
1130 int d = pl->blocked_los[ax][ay]; 1169 int d = pl->blocked_los[ax][ay];
1131 1170
1132 if (d > 3) 1171 if (d > 3)
1133 { 1172 {
1134 1173
… …
1209 uint8 flags = 0; 1248 uint8 flags = 0;
1210 tag_t player = 0; 1249 tag_t player = 0;
1211 1250
1212 // send hp information, if applicable 1251 // send hp information, if applicable
1213 if (object *op = ms.faces_obj [0]) 1252 if (object *op = ms.faces_obj [0])
1253 if (op->is_head () && !op->invisible)
1214 { 1254 {
1215 if (op->head || op->invisible) 1255 if (op->stats.maxhp > op->stats.hp
1216 ; // do not show 1256 && op->stats.maxhp > 0
1217 else if (op->type == PLAYER 1257 && (op->type == PLAYER
1258 || op->type == DOOR // does not work, have maxhp 0
1218 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1259 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)))
1219 {
1220 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1221 { 1260 {
1222 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1261 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1223 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge 1262 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1224 } 1263 }
1225 }
1226 1264
1227 if (op->msg && op->msg[0] == '@') 1265 if (op->msg && op->msg[0] == '@')
1228 flags |= 1; 1266 flags |= 1;
1229 1267
1230 if (op->type == PLAYER && op != ob) 1268 if (op->type == PLAYER && op != ob)
1231 player = op->count; 1269 player = op->count;
1232 } 1270 }
1233 1271
1234 if (lastcell.stat_hp != stat_hp) 1272 if (lastcell.stat_hp != stat_hp)
1235 { 1273 {
1236 lastcell.stat_hp = stat_hp; 1274 lastcell.stat_hp = stat_hp;
1237 1275
… …
1388 sl << "replyinfo skill_info\n"; 1426 sl << "replyinfo skill_info\n";
1389 1427
1390 for (int i = 1; i < NUM_SKILLS; i++) 1428 for (int i = 1; i < NUM_SKILLS; i++)
1391 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1429 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1392 1430
1393 if (sl.length () >= MAXSOCKBUF) 1431 if (sl.length () > MAXSOCKBUF)
1394 { 1432 {
1395 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1433 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1396 fatal (0); 1434 fatal (0);
1397 } 1435 }
1398 1436
… …
1411 sl << "replyinfo spell_paths\n"; 1449 sl << "replyinfo spell_paths\n";
1412 1450
1413 for (int i = 0; i < NRSPELLPATHS; i++) 1451 for (int i = 0; i < NRSPELLPATHS; i++)
1414 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1452 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1415 1453
1416 if (sl.length () >= MAXSOCKBUF) 1454 if (sl.length () > MAXSOCKBUF)
1417 { 1455 {
1418 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1456 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1419 fatal (0); 1457 fatal (0);
1420 } 1458 }
1421 1459
… …
1529 if (!spell->face) 1567 if (!spell->face)
1530 { 1568 {
1531 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1569 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1532 spell->face = face_find ("burnout.x11", blank_face); 1570 spell->face = face_find ("burnout.x11", blank_face);
1533 } 1571 }
1572
1573 pl->ns->send_face (spell->face);
1534 1574
1535 /* send the current values */ 1575 /* send the current values */
1536 sl << uint32 (spell->count) 1576 sl << uint32 (spell->count)
1537 << uint16 (spell->level) 1577 << uint16 (spell->level)
1538 << uint16 (spell->casting_time) 1578 << uint16 (spell->casting_time)
… …
1574 * bytes and 3 strings (because that is the spec) so we need to 1614 * bytes and 3 strings (because that is the spec) so we need to
1575 * check that the length of those 3 strings, plus the 23 bytes, 1615 * check that the length of those 3 strings, plus the 23 bytes,
1576 * won't take us over the length limit for the socket, if it does, 1616 * won't take us over the length limit for the socket, if it does,
1577 * we need to send what we already have, and restart packet formation 1617 * we need to send what we already have, and restart packet formation
1578 */ 1618 */
1619 if (spell->type != SPELL)
1620 continue;
1621
1579 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1622 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1580 * to show add_spell is 26 bytes + 2 strings. However, the overun 1623 * to show add_spell is 26 bytes + 2 strings. However, the overun
1581 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1624 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1582 * like it will fix this 1625 * like it will fix this
1583 */ 1626 */
1584 if (spell->type != SPELL)
1585 continue;
1586
1587 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1627 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1588 { 1628 {
1629 pl->ns->flush_fx ();
1589 pl->ns->send_packet (sl); 1630 pl->ns->send_packet (sl);
1590 1631
1591 sl.reset (); 1632 sl.reset ();
1592 sl << "addspell "; 1633 sl << "addspell ";
1593 } 1634 }
… …
1601 return; 1642 return;
1602 } 1643 }
1603 else 1644 else
1604 append_spell (pl, sl, spell); 1645 append_spell (pl, sl, spell);
1605 1646
1606 if (sl.length () >= MAXSOCKBUF) 1647 if (sl.length () > MAXSOCKBUF)
1607 { 1648 {
1608 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1649 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1609 fatal (0); 1650 fatal (0);
1610 } 1651 }
1611 1652
1612 /* finally, we can send the packet */ 1653 /* finally, we can send the packet */
1654 pl->ns->flush_fx ();
1613 pl->ns->send_packet (sl); 1655 pl->ns->send_packet (sl);
1614} 1656}
1615 1657

Diff Legend

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