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.114 by root, Tue Jul 10 06:05:55 2007 UTC vs.
Revision 1.128 by root, Tue May 6 16:55:26 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)
… …
190 socket.current_y = ob->y; 192 socket.current_y = ob->y;
191 193
192 region *reg = ob->region (); 194 region *reg = ob->region ();
193 if (socket.current_region != reg) 195 if (socket.current_region != reg)
194 { 196 {
197 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
195 socket.current_region = reg; 198 socket.current_region = reg;
196 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
197 } 199 }
198} 200}
199 201
200/** 202/**
201 * RequestInfo is sort of a meta command. There is some specific 203 * RequestInfo is sort of a meta command. There is some specific
… …
246{ 248{
247 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 249 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
248} 250}
249 251
250void 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;
336}
337
338void
251MapInfoCmd (char *buf, int len, player *pl) 339MapInfoCmd (char *buf, int len, player *pl)
252{ 340{
253 // <mapinfo tag spatial tile-path 341 // <mapinfo tag spatial tile-path
254 // >mapinfo tag spatial flags x y w h hash 342 // >mapinfo tag spatial flags x y w h hash
255 343
256 char bigbuf[MAX_BUF], *token;
257
258 token = buf; 344 char *token = buf;
259 // copy token 345
260 if (!(buf = strchr (buf, ' '))) 346 if (!(buf = strchr (buf, ' ')))
261 return; 347 return;
262 348
263 *buf++ = 0;
264
265 if (!strncmp (buf, "spatial ", 8)) 349 if (!strncmp (buf, " spatial ", 9))
266 { 350 {
267 buf += 8; 351 char *copy = strdup (token);
352 copy [buf - token] = 0;
268 353
269 // initial map and its origin 354#if 0
270 maptile *map = pl->ob->map; 355 // this makes only sense when we flush the buffer immediately
271 sint16 dx, dy; 356 if (pl->ns->mapinfo_try (copy))
272 int mapx = pl->ns->mapx / 2 - pl->ob->x; 357 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 358 else
325 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 359#endif
360 pl->ns->mapinfo_queue.push_back (copy);
326 } 361 }
327 else 362 else
328 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 363 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
329
330 pl->ns->send_packet (bigbuf);
331} 364}
332 365
333/** This is the Setup cmd */ 366/** This is the Setup cmd */
334void 367void
335SetUp (char *buf, int len, client * ns) 368SetUp (char *buf, int len, client * ns)
… …
853 886
854/** 887/**
855 * Tells the client that here is a player it should start using. 888 * Tells the client that here is a player it should start using.
856 */ 889 */
857void 890void
858esrv_new_player (player *pl, uint32 weight) 891esrv_new_player (player *pl)
859{ 892{
893 sint32 weight = pl->ob->client_weight ();
894
860 packet sl ("player"); 895 packet sl ("player");
861 896
862 sl << uint32 (pl->ob->count) 897 sl << uint32 (pl->ob->count)
863 << uint32 (weight) 898 << uint32 (weight)
864 << uint32 (pl->ob->face) 899 << uint32 (pl->ob->face)
… …
931 966
932 if (!ns.faces_sent[face_num]) 967 if (!ns.faces_sent[face_num])
933 if (ob) 968 if (ob)
934 ns.send_faces (ob); 969 ns.send_faces (ob);
935 else 970 else
936 ns.send_face (face_num); 971 ns.send_face (face_num, 10);
937 972
938 sl << uint16 (face_num); 973 sl << uint16 (face_num);
939 return 1; 974 return 1;
940 } 975 }
941 976
… …
998 1033
999 /* If player is just joining the game, he isn't here yet, so the map 1034 /* 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 1035 * can get swapped out. If so, don't try to send them a map. All will
1001 * be OK once they really log in. 1036 * be OK once they really log in.
1002 */ 1037 */
1003 if (!plmap || plmap->in_memory != MAP_IN_MEMORY) 1038 if (!plmap || plmap->in_memory != MAP_ACTIVE)
1004 return; 1039 return;
1005 1040
1006 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1041 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1007 int estartlen, eoldlen; 1042 int estartlen, eoldlen;
1008 uint8 eentrysize; 1043 uint8 eentrysize;
… …
1096 1131
1097 if (!m) 1132 if (!m)
1098 { 1133 {
1099 nx = x; ny = y; m = plmap; 1134 nx = x; ny = y; m = plmap;
1100 1135
1101 if (!xy_normalise (m, nx, ny)) 1136 if (xy_normalise (m, nx, ny))
1137 m->touch ();
1138 else
1102 m = 0; 1139 m = 0;
1103 } 1140 }
1104 1141
1105 int emask, mask; 1142 int emask, mask;
1106 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1143 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
… …
1123 } 1160 }
1124 1161
1125 continue; 1162 continue;
1126 } 1163 }
1127 1164
1128 m->touch ();
1129
1130 int d = pl->blocked_los[ax][ay]; 1165 int d = pl->blocked_los[ax][ay];
1131 1166
1132 if (d > 3) 1167 if (d > 3)
1133 { 1168 {
1134 1169
… …
1209 uint8 flags = 0; 1244 uint8 flags = 0;
1210 tag_t player = 0; 1245 tag_t player = 0;
1211 1246
1212 // send hp information, if applicable 1247 // send hp information, if applicable
1213 if (object *op = ms.faces_obj [0]) 1248 if (object *op = ms.faces_obj [0])
1249 if (op->is_head () && !op->invisible)
1214 { 1250 {
1215 if (op->head || op->invisible) 1251 if (op->stats.maxhp > op->stats.hp
1216 ; // do not show 1252 && op->stats.maxhp > 0
1217 else if (op->type == PLAYER 1253 && (op->type == PLAYER
1254 || 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)) 1255 || 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 { 1256 {
1222 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1257 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 1258 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1224 } 1259 }
1225 }
1226 1260
1227 if (op->msg && op->msg[0] == '@') 1261 if (op->msg && op->msg[0] == '@')
1228 flags |= 1; 1262 flags |= 1;
1229 1263
1230 if (op->type == PLAYER && op != ob) 1264 if (op->type == PLAYER && op != ob)
1231 player = op->count; 1265 player = op->count;
1232 } 1266 }
1233 1267
1234 if (lastcell.stat_hp != stat_hp) 1268 if (lastcell.stat_hp != stat_hp)
1235 { 1269 {
1236 lastcell.stat_hp = stat_hp; 1270 lastcell.stat_hp = stat_hp;
1237 1271
… …
1388 sl << "replyinfo skill_info\n"; 1422 sl << "replyinfo skill_info\n";
1389 1423
1390 for (int i = 1; i < NUM_SKILLS; i++) 1424 for (int i = 1; i < NUM_SKILLS; i++)
1391 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1425 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1392 1426
1393 if (sl.length () >= MAXSOCKBUF) 1427 if (sl.length () > MAXSOCKBUF)
1394 { 1428 {
1395 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1429 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1396 fatal (0); 1430 fatal (0);
1397 } 1431 }
1398 1432
… …
1411 sl << "replyinfo spell_paths\n"; 1445 sl << "replyinfo spell_paths\n";
1412 1446
1413 for (int i = 0; i < NRSPELLPATHS; i++) 1447 for (int i = 0; i < NRSPELLPATHS; i++)
1414 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1448 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1415 1449
1416 if (sl.length () >= MAXSOCKBUF) 1450 if (sl.length () > MAXSOCKBUF)
1417 { 1451 {
1418 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1452 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1419 fatal (0); 1453 fatal (0);
1420 } 1454 }
1421 1455
… …
1529 if (!spell->face) 1563 if (!spell->face)
1530 { 1564 {
1531 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1565 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1532 spell->face = face_find ("burnout.x11", blank_face); 1566 spell->face = face_find ("burnout.x11", blank_face);
1533 } 1567 }
1568
1569 pl->ns->send_face (spell->face);
1534 1570
1535 /* send the current values */ 1571 /* send the current values */
1536 sl << uint32 (spell->count) 1572 sl << uint32 (spell->count)
1537 << uint16 (spell->level) 1573 << uint16 (spell->level)
1538 << uint16 (spell->casting_time) 1574 << uint16 (spell->casting_time)
… …
1574 * bytes and 3 strings (because that is the spec) so we need to 1610 * bytes and 3 strings (because that is the spec) so we need to
1575 * check that the length of those 3 strings, plus the 23 bytes, 1611 * check that the length of those 3 strings, plus the 23 bytes,
1576 * won't take us over the length limit for the socket, if it does, 1612 * won't take us over the length limit for the socket, if it does,
1577 * we need to send what we already have, and restart packet formation 1613 * we need to send what we already have, and restart packet formation
1578 */ 1614 */
1615 if (spell->type != SPELL)
1616 continue;
1617
1579 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1618 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1580 * to show add_spell is 26 bytes + 2 strings. However, the overun 1619 * to show add_spell is 26 bytes + 2 strings. However, the overun
1581 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1620 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1582 * like it will fix this 1621 * like it will fix this
1583 */ 1622 */
1584 if (spell->type != SPELL)
1585 continue;
1586
1587 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1623 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1588 { 1624 {
1625 pl->ns->flush_fx ();
1589 pl->ns->send_packet (sl); 1626 pl->ns->send_packet (sl);
1590 1627
1591 sl.reset (); 1628 sl.reset ();
1592 sl << "addspell "; 1629 sl << "addspell ";
1593 } 1630 }
… …
1601 return; 1638 return;
1602 } 1639 }
1603 else 1640 else
1604 append_spell (pl, sl, spell); 1641 append_spell (pl, sl, spell);
1605 1642
1606 if (sl.length () >= MAXSOCKBUF) 1643 if (sl.length () > MAXSOCKBUF)
1607 { 1644 {
1608 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1645 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1609 fatal (0); 1646 fatal (0);
1610 } 1647 }
1611 1648
1612 /* finally, we can send the packet */ 1649 /* finally, we can send the packet */
1650 pl->ns->flush_fx ();
1613 pl->ns->send_packet (sl); 1651 pl->ns->send_packet (sl);
1614} 1652}
1615 1653

Diff Legend

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