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.96 by root, Sat May 12 19:30:18 2007 UTC vs.
Revision 1.103 by root, Mon Jun 4 13:04:01 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2001 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
9 * it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
10 * the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
11 * (at your option) any later version. 11 * 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, but
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 * GNU General Public License for more details. 16 * 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 along
19 * along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 21 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors 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.
… …
145/** check for map/region change and send new map data */ 145/** check for map/region change and send new map data */
146static void 146static void
147check_map_change (player *pl) 147check_map_change (player *pl)
148{ 148{
149 client &socket = *pl->ns; 149 client &socket = *pl->ns;
150 object *ob = pl->ob; 150 object *ob = pl->observe;
151 char buf[MAX_BUF]; /* eauugggh */
152 151
153 if (socket.current_map != ob->map || socket.force_newmap) 152 if (socket.current_map != ob->map || socket.force_newmap)
154 { 153 {
155 clear_map (pl); 154 clear_map (pl);
156 socket.current_map = ob->map; 155 socket.current_map = ob->map;
… …
164 if (ob->map->tile_path[0]) flags |= 1; 163 if (ob->map->tile_path[0]) flags |= 1;
165 if (ob->map->tile_path[1]) flags |= 2; 164 if (ob->map->tile_path[1]) flags |= 2;
166 if (ob->map->tile_path[2]) flags |= 4; 165 if (ob->map->tile_path[2]) flags |= 4;
167 if (ob->map->tile_path[3]) flags |= 8; 166 if (ob->map->tile_path[3]) flags |= 8;
168 167
169 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 168 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
170 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path); 169 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
170 ob->map->width, ob->map->height, &ob->map->path);
171 } 171 }
172 else 172 else
173 snprintf (buf, MAX_BUF, "mapinfo current");
174
175 socket.send_packet (buf); 173 socket.send_packet ("mapinfo current");
176 } 174 }
177 } 175 }
178 else if (socket.current_x != ob->x || socket.current_y != ob->y) 176 else if (socket.current_x != ob->x || socket.current_y != ob->y)
179 { 177 {
180 int dx = ob->x - socket.current_x; 178 int dx = ob->x - socket.current_x;
… …
740 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 738 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
741 739
742 if (pl->combat_ob) 740 if (pl->combat_ob)
743 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; 741 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
744 742
743 //TODO: remove this when slot system is working, this is only for debugging
744 if (pl->ob->chosen_skill)
745 buf << " Skill*: " << pl->ob->chosen_skill->name;
746
745 //TODO: maybe golem should become the current_weapon, quite simply? 747 //TODO: maybe golem should become the current_weapon, quite simply?
746 if (pl->golem) 748 if (pl->golem)
747 buf << " Golem*: " << pl->golem->name; 749 buf << " Golem*: " << pl->golem->name;
748 750
749 buf.linearise (obuf); 751 buf.linearise (obuf);
… …
763#define AddIfShort(Old,New,Type) if (Old != New) {\ 765#define AddIfShort(Old,New,Type) if (Old != New) {\
764 Old = New; \ 766 Old = New; \
765 sl << uint8 (Type) << uint16 (New); \ 767 sl << uint8 (Type) << uint16 (New); \
766 } 768 }
767 769
768#define AddIfFloat(Old,New,Type) if (Old != New) {\ 770#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
769 Old = New; \ 771 Old = New; \
770 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 772 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
771 } 773 }
772 774
773#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 775#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
774 free(Old); Old = strdup (New);\ 776 free(Old); Old = strdup (New);\
775 sl << uint8 (Type) << data8 (New); \ 777 sl << uint8 (Type) << data8 (New); \
… …
789 791
790 client *ns = pl->ns; 792 client *ns = pl->ns;
791 if (!ns) 793 if (!ns)
792 return; 794 return;
793 795
794 object *ob = pl->ob; 796 object *ob = pl->observe;
795 if (!ob) 797 if (!ob)
796 return; 798 return;
797 799
798 packet sl ("stats"); 800 packet sl ("stats");
799 801
… …
828 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 830 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
829 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 831 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
830 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 832 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
831 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 833 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
832 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 834 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
833 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 835 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
834 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 836 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
835 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 837 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
836 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 838 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
837 839
838 flags = 0; 840 flags = 0;
839 841
840 if (pl->fire_on) 842 if (pl->fire_on)
… …
1006{ 1008{
1007 prefetch_surrounding_maps (op->map, 3); 1009 prefetch_surrounding_maps (op->map, 3);
1008} 1010}
1009 1011
1010/** 1012/**
1011 * This function uses the new map1 protocol command to send the map 1013 * Draws client map.
1012 * to the client. It is necessary because the old map command supports
1013 * a maximum map size of 15x15.
1014 * This function is much simpler than the old one. This is because
1015 * the old function optimized to send as few face identifiers as possible,
1016 * at the expense of sending more coordinate location (coordinates were
1017 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1018 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1019 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1020 * and use the other 4 bits for other informatiion. For full documentation
1021 * of what we send, see the doc/Protocol file.
1022 * I will describe internally what we do:
1023 * the ns->lastmap shows how the map last looked when sent to the client.
1024 * in the lastmap structure, there is a cells array, which is set to the
1025 * maximum viewable size (As set in config.h).
1026 * in the cells, there are faces and a count value.
1027 * we use the count value to hold the darkness value. If -1, then this space
1028 * is not viewable.
1029 * we use faces[0] faces[1] faces[2] to hold what the three layers
1030 * look like.
1031 */ 1014 */
1032void 1015void
1033draw_client_map1 (object *pl) 1016draw_client_map (player *pl)
1034{ 1017{
1018 object *ob = pl->observe;
1019 if (!ob->active)
1020 return;
1021
1022 maptile *plmap = ob->map;
1023
1024 /* 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
1026 * be OK once they really log in.
1027 */
1028 if (!plmap || plmap->in_memory != MAP_IN_MEMORY)
1029 return;
1030
1035 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1031 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1036 sint16 nx, ny; 1032 sint16 nx, ny;
1037 int estartlen, eoldlen; 1033 int estartlen, eoldlen;
1038 uint8 eentrysize; 1034 uint8 eentrysize;
1039 uint16 ewhatstart, ewhatflag; 1035 uint16 ewhatstart, ewhatflag;
1040 uint8 extendedinfos; 1036 uint8 extendedinfos;
1041 maptile *m; 1037 maptile *m;
1042 1038
1043 client &socket = *pl->contr->ns;
1044
1045 if (!pl->active)
1046 return;
1047
1048 check_map_change (pl->contr); 1039 check_map_change (pl);
1049 prefetch_surrounding_maps (pl); 1040 prefetch_surrounding_maps (pl->ob);
1041
1042 /* do LOS after calls to update_position */
1043 if (ob != pl->ob)
1044 clear_los (pl);
1045 else if (pl->do_los)
1046 {
1047 update_los (ob);
1048 pl->do_los = 0;
1049 }
1050
1051 /**
1052 * This function uses the new map1 protocol command to send the map
1053 * to the client. It is necessary because the old map command supports
1054 * a maximum map size of 15x15.
1055 * This function is much simpler than the old one. This is because
1056 * the old function optimized to send as few face identifiers as possible,
1057 * at the expense of sending more coordinate location (coordinates were
1058 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1059 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1060 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1061 * and use the other 4 bits for other informatiion. For full documentation
1062 * of what we send, see the doc/Protocol file.
1063 * I will describe internally what we do:
1064 * the ns->lastmap shows how the map last looked when sent to the client.
1065 * in the lastmap structure, there is a cells array, which is set to the
1066 * maximum viewable size (As set in config.h).
1067 * in the cells, there are faces and a count value.
1068 * we use the count value to hold the darkness value. If -1, then this space
1069 * is not viewable.
1070 * we use faces[0] faces[1] faces[2] to hold what the three layers
1071 * look like.
1072 */
1073
1074 client &socket = *pl->ns;
1050 1075
1051 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1076 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1052 packet esl; 1077 packet esl;
1053 1078
1054 startlen = sl.length (); 1079 startlen = sl.length ();
… …
1078 ay = 0; 1103 ay = 0;
1079 1104
1080 /* We could do this logic as conditionals in the if statement, 1105 /* We could do this logic as conditionals in the if statement,
1081 * but that started to get a bit messy to look at. 1106 * but that started to get a bit messy to look at.
1082 */ 1107 */
1083 max_x = pl->x + (socket.mapx + 1) / 2; 1108 max_x = ob->x + (socket.mapx + 1) / 2;
1084 max_y = pl->y + (socket.mapy + 1) / 2; 1109 max_y = ob->y + (socket.mapy + 1) / 2;
1085 1110
1086 maptile *plmap = pl->map;
1087
1088 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1111 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1089 { 1112 {
1090 ax = 0; 1113 ax = 0;
1091 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1114 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1092 { 1115 {
1093 int emask, mask; 1116 int emask, mask;
1094 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1117 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1095 1118
1096 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1119 MapCell &lastcell = socket.lastmap.cells[ax][ay];
… …
1117 continue; 1140 continue;
1118 } 1141 }
1119 1142
1120 m->touch (); 1143 m->touch ();
1121 1144
1122 int d = pl->contr->blocked_los[ax][ay]; 1145 int d = pl->blocked_los[ax][ay];
1123 1146
1124 if (d > 3) 1147 if (d > 3)
1125 { 1148 {
1126 1149
1127 int need_send = 0, count; 1150 int need_send = 0, count;
… …
1209 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1232 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1210 { 1233 {
1211 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) 1234 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1212 { 1235 {
1213 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1236 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1214 stat_width = op->arch->tail_x; 1237 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1215 } 1238 }
1216 } 1239 }
1217 1240
1218 if (op->msg && op->msg[0] == '@') 1241 if (op->msg && op->msg[0] == '@')
1219 flags |= 1; 1242 flags |= 1;
1220 1243
1221 if (op->type == PLAYER && op != pl) 1244 if (op->type == PLAYER && op != ob)
1222 player = op->count; 1245 player = op->count;
1223 } 1246 }
1224 1247
1225 if (lastcell.stat_hp != stat_hp) 1248 if (lastcell.stat_hp != stat_hp)
1226 { 1249 {
… …
1270 1293
1271 /* Middle face */ 1294 /* Middle face */
1272 if (update_space (sl, socket, ms, lastcell, 1)) 1295 if (update_space (sl, socket, ms, lastcell, 1))
1273 mask |= 0x2; 1296 mask |= 0x2;
1274 1297
1275 if (ms.player () == pl 1298 if (ms.player () == ob
1276 && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) 1299 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1277 { 1300 {
1278 // force player to be visible to himself if invisible 1301 // force player to be visible to himself if invisible
1279 if (lastcell.faces[0] != pl->face) 1302 if (lastcell.faces[0] != ob->face)
1280 { 1303 {
1281 lastcell.faces[0] = pl->face; 1304 lastcell.faces[0] = ob->face;
1282 1305
1283 mask |= 0x1; 1306 mask |= 0x1;
1284 sl << uint16 (pl->face); 1307 sl << uint16 (ob->face);
1285 1308
1286 socket.send_faces (pl); 1309 socket.send_faces (ob);
1287 } 1310 }
1288 } 1311 }
1289 /* Top face */ 1312 /* Top face */
1290 else if (update_space (sl, socket, ms, lastcell, 0)) 1313 else if (update_space (sl, socket, ms, lastcell, 0))
1291 mask |= 0x1; 1314 mask |= 0x1;
1292
1293 1315
1294 /* Check to see if we are in fact sending anything for this 1316 /* Check to see if we are in fact sending anything for this
1295 * space by checking the mask. If so, update the mask. 1317 * space by checking the mask. If so, update the mask.
1296 * if not, reset the len to that from before adding the mask 1318 * if not, reset the len to that from before adding the mask
1297 * value, so we don't send those bits. 1319 * value, so we don't send those bits.
… …
1356 socket.send_packet (sl); 1378 socket.send_packet (sl);
1357 socket.sent_scroll = 0; 1379 socket.sent_scroll = 0;
1358 } 1380 }
1359} 1381}
1360 1382
1361/**
1362 * Draws client map.
1363 */
1364void
1365draw_client_map (object *pl)
1366{
1367 int i, j;
1368 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1369 int mflags;
1370 struct Map newmap;
1371 maptile *m, *pm;
1372
1373 if (pl->type != PLAYER)
1374 {
1375 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1376 return;
1377 }
1378
1379 pm = pl->map;
1380
1381 /* If player is just joining the game, he isn't here yet, so the map
1382 * can get swapped out. If so, don't try to send them a map. All will
1383 * be OK once they really log in.
1384 */
1385 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1386 return;
1387
1388 memset (&newmap, 0, sizeof (struct Map));
1389
1390 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1391 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1392 {
1393 ax = i;
1394 ay = j;
1395 m = pm;
1396 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1397
1398 if (mflags & P_OUT_OF_MAP)
1399 continue;
1400
1401 /* If a map is visible to the player, we don't want to swap it out
1402 * just to reload it. This should really call something like
1403 * swap_map, but this is much more efficient and 'good enough'
1404 */
1405 if (mflags & P_NEW_MAP)
1406 m->timeout = 50;
1407 }
1408
1409 /* do LOS after calls to update_position */
1410 if (pl->contr->do_los)
1411 {
1412 update_los (pl);
1413 pl->contr->do_los = 0;
1414 }
1415
1416 /* Big maps need a different drawing mechanism to work */
1417 draw_client_map1 (pl);
1418}
1419
1420
1421/*****************************************************************************/ 1383/*****************************************************************************/
1422
1423/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 1384/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1424
1425/* a player. Of course, the client need to know the command to be able to */ 1385/* a player. Of course, the client need to know the command to be able to */
1426
1427/* manage it ! */ 1386/* manage it ! */
1428
1429/*****************************************************************************/ 1387/*****************************************************************************/
1430void 1388void
1431send_plugin_custom_message (object *pl, char *buf) 1389send_plugin_custom_message (object *pl, char *buf)
1432{ 1390{
1433 pl->contr->ns->send_packet (buf); 1391 pl->contr->ns->send_packet (buf);

Diff Legend

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