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.61 by root, Mon Jan 8 18:18:36 2007 UTC vs.
Revision 1.69 by root, Sun Mar 11 02:12:45 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 Copyright (C) 2001 Mark Wedel 5 * Copyright (C) 2001 Mark Wedel
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 (at your option) any later version. 11 * (at your option) any later version.
12 12 *
13 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
18 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 21 *
22 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author can be reached via e-mail to <crossfire@schmorp.de>
23*/ 23 */
24 24
25/** 25/**
26 * \file 26 * \file
27 * Client handling. 27 * Client handling.
28 * 28 *
… …
36 * have the prototype of (char *data, int datalen, int client_num). This 36 * have the prototype of (char *data, int datalen, int client_num). This
37 * way, we can use one dispatch table. 37 * way, we can use one dispatch table.
38 * 38 *
39 * esrv_map_new starts updating the map 39 * esrv_map_new starts updating the map
40 * 40 *
41 * esrv_map_setbelow allows filling in all of the faces for the map.
42 * if a face has not already been sent to the client, it is sent now.
43 *
44 */ 41 */
45 42
46#include <global.h> 43#include <global.h>
47#include <sproto.h> 44#include <sproto.h>
48 45
… …
147 pl->ns->send_packet ("newmap"); 144 pl->ns->send_packet ("newmap");
148 145
149 pl->ns->floorbox_reset (); 146 pl->ns->floorbox_reset ();
150} 147}
151 148
152/** check for map change and send new map data */ 149/** check for map/region change and send new map data */
153static void 150static void
154check_map_change (player *pl) 151check_map_change (player *pl)
155{ 152{
156 client &socket = *pl->ns; 153 client &socket = *pl->ns;
157 object *ob = pl->ob; 154 object *ob = pl->ob;
… …
201 } 198 }
202 } 199 }
203 200
204 socket.current_x = ob->x; 201 socket.current_x = ob->x;
205 socket.current_y = ob->y; 202 socket.current_y = ob->y;
203
204 region *reg = ob->region ();
205 if (socket.current_region != reg)
206 {
207 socket.current_region = reg;
208 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
209 }
206} 210}
207 211
208/** 212/**
209 * RequestInfo is sort of a meta command. There is some specific 213 * RequestInfo is sort of a meta command. There is some specific
210 * request of information, but we call other functions to provide 214 * request of information, but we call other functions to provide
… …
701 uint16 smoothface; 705 uint16 smoothface;
702 706
703 /* If we can't find a face, return and set it so we won't try to send this 707 /* If we can't find a face, return and set it so we won't try to send this
704 * again. 708 * again.
705 */ 709 */
706 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 710 if (!FindSmooth (face, &smoothface))
707 { 711 {
708 712
709 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); 713 LOG (llevError, "could not findsmooth for %d.\n", face);
710 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 714 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
711 return; 715 return;
712 } 716 }
713 717
714 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 718 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
… …
722 << uint16 (smoothface); 726 << uint16 (smoothface);
723 727
724 ns->send_packet (sl); 728 ns->send_packet (sl);
725} 729}
726 730
727 /** 731/**
728 * Tells client the picture it has to use 732 * Tells client the picture it has to use
729 * to smooth a picture number given as argument. 733 * to smooth a picture number given as argument.
730 */ 734 */
731void 735void
732AskSmooth (char *buf, int len, client *ns) 736AskSmooth (char *buf, int len, client *ns)
733{ 737{
734 SendSmooth (ns, atoi (buf)); 738 SendSmooth (ns, atoi (buf));
735} 739}
… …
798 * commands. 802 * commands.
799 */ 803 */
800 pl->count = 0; 804 pl->count = 0;
801 805
802 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 806 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
803 int time = FABS (pl->ob->speed) < 0.001 807 int time = fabs (pl->ob->speed) < 0.001
804 ? time = MAX_TIME * 100 808 ? time = MAX_TIME * 100
805 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 809 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
806 810
807 /* Send confirmation of command execution now */ 811 /* Send confirmation of command execution now */
808 packet sl ("comc"); 812 packet sl ("comc");
809 sl << uint16 (cmdid) << uint32 (time); 813 sl << uint16 (cmdid) << uint32 (time);
810 pl->ns->send_packet (sl); 814 pl->ns->send_packet (sl);
… …
1104{ 1108{
1105 packet sl ("player"); 1109 packet sl ("player");
1106 1110
1107 sl << uint32 (pl->ob->count) 1111 sl << uint32 (pl->ob->count)
1108 << uint32 (weight) 1112 << uint32 (weight)
1109 << uint32 (pl->ob->face->number) 1113 << uint32 (pl->ob->face)
1110 << data8 (pl->ob->name); 1114 << data8 (pl->ob->name);
1111 1115
1112 pl->ns->last_weight = weight; 1116 pl->ns->last_weight = weight;
1113 pl->ns->send_packet (sl); 1117 pl->ns->send_packet (sl);
1114 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1118 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
… …
1159/****************************************************************************** 1163/******************************************************************************
1160 * 1164 *
1161 * Start of map related commands. 1165 * Start of map related commands.
1162 * 1166 *
1163 ******************************************************************************/ 1167 ******************************************************************************/
1164
1165/**
1166 * This adds face_num to a map cell at x,y. If the client doesn't have
1167 * the face yet, we will also send it.
1168 */
1169static void
1170esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1171{
1172 if (newmap->cells[x][y].count >= MAP_LAYERS)
1173 {
1174 //TODO: one or the other, can't both have abort and return, verify and act
1175 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1176 return;
1177 abort ();
1178 }
1179
1180 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1181 newmap->cells[x][y].count++;
1182
1183 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1184 esrv_send_face (ns, face_num, 0);
1185}
1186 1168
1187/** Clears a map cell */ 1169/** Clears a map cell */
1188static void 1170static void
1189map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1171map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1190{ 1172{
… …
1234check_head (packet &sl, client &ns, int ax, int ay, int layer) 1216check_head (packet &sl, client &ns, int ax, int ay, int layer)
1235{ 1217{
1236 short face_num; 1218 short face_num;
1237 1219
1238 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1220 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1239 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1221 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face;
1240 else 1222 else
1241 face_num = 0; 1223 face_num = 0;
1242 1224
1243 if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) 1225 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1244 { 1226 {
… …
1329 if (!ob || ob->face == blank_face) 1311 if (!ob || ob->face == blank_face)
1330 face_num = 0; 1312 face_num = 0;
1331 else if (head) 1313 else if (head)
1332 { 1314 {
1333 /* if this is a head that had previously been stored */ 1315 /* if this is a head that had previously been stored */
1334 face_num = ob->face->number; 1316 face_num = ob->face;
1335 } 1317 }
1336 else 1318 else
1337 { 1319 {
1338 /* if the faces for the different parts of a multipart object 1320 /* if the faces for the different parts of a multipart object
1339 * are the same, we only want to send the bottom right most 1321 * are the same, we only want to send the bottom right most
… …
1381 /* single part object, multipart object with non merged faces, 1363 /* single part object, multipart object with non merged faces,
1382 * of multipart object already at lower right. 1364 * of multipart object already at lower right.
1383 */ 1365 */
1384 else if (bx == sx && by == sy) 1366 else if (bx == sx && by == sy)
1385 { 1367 {
1386 face_num = ob->face->number; 1368 face_num = ob->face;
1387 1369
1388 /* if this face matches one stored away, clear that one away. 1370 /* if this face matches one stored away, clear that one away.
1389 * this code relies on the fact that the map1 commands 1371 * this code relies on the fact that the map1 commands
1390 * goes from 2 down to 0. 1372 * goes from 2 down to 0.
1391 */ 1373 */
1392 for (i = 0; i < MAP_LAYERS; i++) 1374 for (i = 0; i < MAP_LAYERS; i++)
1393 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] && 1375 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1394 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num) 1376 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face == face_num)
1395 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL; 1377 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1396 } 1378 }
1397 else 1379 else
1398 { 1380 {
1399 /* If this head is stored away, clear it - otherwise, 1381 /* If this head is stored away, clear it - otherwise,
1400 * there can be cases where a object is on multiple layers - 1382 * there can be cases where a object is on multiple layers -
1401 * we only want to send it once. 1383 * we only want to send it once.
1402 */ 1384 */
1403 face_num = head->face->number; 1385 face_num = head->face;
1404 for (i = 0; i < MAP_LAYERS; i++) 1386 for (i = 0; i < MAP_LAYERS; i++)
1405 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] && 1387 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1406 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num) 1388 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face == face_num)
1407 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL; 1389 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1408 1390
1409 /* First, try to put the new head on the same layer. If that is used up, 1391 /* First, try to put the new head on the same layer. If that is used up,
1410 * then find another layer. 1392 * then find another layer.
1411 */ 1393 */
… …
1428 else 1410 else
1429 { 1411 {
1430 /* In this case, we are already at the lower right or single part object, 1412 /* In this case, we are already at the lower right or single part object,
1431 * so nothing special 1413 * so nothing special
1432 */ 1414 */
1433 face_num = ob->face->number; 1415 face_num = ob->face;
1434 1416
1435 /* clear out any head entries that have the same face as this one */ 1417 /* clear out any head entries that have the same face as this one */
1436 for (bx = 0; bx < layer; bx++) 1418 for (bx = 0; bx < layer; bx++)
1437 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] && 1419 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1438 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num) 1420 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face == face_num)
1439 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL; 1421 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1440 } 1422 }
1441 } /* else not already head object or blank face */ 1423 } /* else not already head object or blank face */
1442 1424
1443 /* This is a real hack. Basically, if we have nothing to send for this layer, 1425 /* This is a real hack. Basically, if we have nothing to send for this layer,
… …
1447 * of the same type, what happens then is it doesn't think it needs to send 1429 * of the same type, what happens then is it doesn't think it needs to send
1448 * This tends to make stacking also work/look better. 1430 * This tends to make stacking also work/look better.
1449 */ 1431 */
1450 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]) 1432 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1451 { 1433 {
1452 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number; 1434 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face;
1453 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL; 1435 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1454 } 1436 }
1455 1437
1456 /* Another hack - because of heads and whatnot, this face may match one 1438 /* Another hack - because of heads and whatnot, this face may match one
1457 * we already sent for a lower layer. In that case, don't send 1439 * we already sent for a lower layer. In that case, don't send
… …
1510 if (!ob || ob->face == blank_face) 1492 if (!ob || ob->face == blank_face)
1511 smoothlevel = 0; 1493 smoothlevel = 0;
1512 else 1494 else
1513 { 1495 {
1514 smoothlevel = ob->smoothlevel; 1496 smoothlevel = ob->smoothlevel;
1515 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1497 if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH))
1516 SendSmooth (&ns, ob->face->number); 1498 SendSmooth (&ns, ob->face);
1517 } /* else not already head object or blank face */ 1499 } /* else not already head object or blank face */
1518 1500
1519 /* We've gotten what face we want to use for the object. Now see if 1501 /* We've gotten what face we want to use for the object. Now see if
1520 * if it has changed since we last sent it to the client. 1502 * if it has changed since we last sent it to the client.
1521 */ 1503 */
… …
1550 if (ns->EMI_smooth) 1532 if (ns->EMI_smooth)
1551 result += 1; /*One byte for smoothlevel */ 1533 result += 1; /*One byte for smoothlevel */
1552 } 1534 }
1553 1535
1554 return result; 1536 return result;
1537}
1538
1539// prefetch (and touch) all maps within a specific distancd
1540static void
1541prefetch_surrounding_maps (maptile *map, int distance)
1542{
1543 map->last_access = runtime;
1544
1545 if (--distance)
1546 for (int dir = 4; --dir; )
1547 if (const shstr &path = map->tile_path [dir])
1548 if (maptile *&neigh = map->tile_map [dir])
1549 prefetch_surrounding_maps (neigh, distance);
1550 else
1551 neigh = maptile::find_async (path, map);
1552}
1553
1554// prefetch a generous area around the player
1555static void
1556prefetch_surrounding_maps (object *op)
1557{
1558 prefetch_surrounding_maps (op->map, 3);
1555} 1559}
1556 1560
1557/** 1561/**
1558 * This function uses the new map1 protocol command to send the map 1562 * This function uses the new map1 protocol command to send the map
1559 * to the client. It is necessary because the old map command supports 1563 * to the client. It is necessary because the old map command supports
… …
1592 1596
1593 if (!pl->active) 1597 if (!pl->active)
1594 return; 1598 return;
1595 1599
1596 check_map_change (pl->contr); 1600 check_map_change (pl->contr);
1601 prefetch_surrounding_maps (pl);
1597 1602
1598 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1603 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1599 packet esl; 1604 packet esl;
1600 1605
1601 startlen = sl.length (); 1606 startlen = sl.length ();
… …
1898 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1903 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
1899 emask |= 0x2; 1904 emask |= 0x2;
1900 1905
1901 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) 1906 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1902 { 1907 {
1903 if (lastcell.faces[0] != pl->face->number) 1908 if (lastcell.faces[0] != pl->face)
1904 { 1909 {
1905 lastcell.faces[0] = pl->face->number; 1910 lastcell.faces[0] = pl->face;
1906 mask |= 0x1; 1911 mask |= 0x1;
1907 1912
1908 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 1913 if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE))
1909 esrv_send_face (&socket, pl->face->number, 0); 1914 esrv_send_face (&socket, pl->face, 0);
1910 1915
1911 sl << uint16 (pl->face->number); 1916 sl << uint16 (pl->face);
1912 } 1917 }
1913 } 1918 }
1914 else 1919 else
1915 { 1920 {
1916 /* Top face */ 1921 /* Top face */
… …
1968 */ 1973 */
1969void 1974void
1970draw_client_map (object *pl) 1975draw_client_map (object *pl)
1971{ 1976{
1972 int i, j; 1977 int i, j;
1973 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 1978 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1974 New_Face *face, *floor;
1975 New_Face *floor2;
1976 int d, mflags; 1979 int mflags;
1977 struct Map newmap; 1980 struct Map newmap;
1978 maptile *m, *pm; 1981 maptile *m, *pm;
1979 1982
1980 if (pl->type != PLAYER) 1983 if (pl->type != PLAYER)
1981 { 1984 {
… …
2162 2165
2163/* appends the spell *spell to the Socklist we will send the data to. */ 2166/* appends the spell *spell to the Socklist we will send the data to. */
2164static void 2167static void
2165append_spell (player *pl, packet &sl, object *spell) 2168append_spell (player *pl, packet &sl, object *spell)
2166{ 2169{
2167 int len, i, skill = 0; 2170 int i, skill = 0;
2168 2171
2169 if (!(spell->name)) 2172 if (!(spell->name))
2170 { 2173 {
2171 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 2174 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2172 return; 2175 return;
… …
2184 if (!strcmp (spell->skill, skill_names[i])) 2187 if (!strcmp (spell->skill, skill_names[i]))
2185 { 2188 {
2186 skill = i + CS_STAT_SKILLINFO; 2189 skill = i + CS_STAT_SKILLINFO;
2187 break; 2190 break;
2188 } 2191 }
2192 }
2193
2194 // spells better have a face
2195 if (!spell->face)
2196 {
2197 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
2198 spell->face = face_find ("burnout.x11", blank_face);
2189 } 2199 }
2190 2200
2191 /* send the current values */ 2201 /* send the current values */
2192 sl << uint32 (spell->count) 2202 sl << uint32 (spell->count)
2193 << uint16 (spell->level) 2203 << uint16 (spell->level)
… …
2195 << uint16 (spell->last_sp) 2205 << uint16 (spell->last_sp)
2196 << uint16 (spell->last_grace) 2206 << uint16 (spell->last_grace)
2197 << uint16 (spell->last_eat) 2207 << uint16 (spell->last_eat)
2198 << uint8 (skill) 2208 << uint8 (skill)
2199 << uint32 (spell->path_attuned) 2209 << uint32 (spell->path_attuned)
2200 << uint32 (spell->face ? spell->face->number : 0) 2210 << uint32 (spell->face)
2201 << data8 (spell->name) 2211 << data8 (spell->name)
2202 << data16 (spell->msg); 2212 << data16 (spell->msg);
2203} 2213}
2204 2214
2205/** 2215/**
… …
2220 2230
2221 packet sl ("addspell"); 2231 packet sl ("addspell");
2222 2232
2223 if (!spell) 2233 if (!spell)
2224 { 2234 {
2225 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2235 for (spell = pl->ob->inv; spell; spell = spell->below)
2226 { 2236 {
2227 /* were we to simply keep appending data here, we could exceed 2237 /* were we to simply keep appending data here, we could exceed
2228 * MAXSOCKBUF if the player has enough spells to add, we know that 2238 * MAXSOCKBUF if the player has enough spells to add, we know that
2229 * append_spells will always append 19 data bytes, plus 4 length 2239 * append_spells will always append 19 data bytes, plus 4 length
2230 * bytes and 3 strings (because that is the spec) so we need to 2240 * bytes and 3 strings (because that is the spec) so we need to

Diff Legend

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