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.91 by root, Mon Apr 30 04:25:30 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;
… …
730 728
731/** 729/**
732 * Get player's current range attack in obuf. 730 * Get player's current range attack in obuf.
733 */ 731 */
734static void 732static void
735rangetostring (object *ob, char *obuf) 733rangetostring (player *pl, char *obuf)
736{ 734{
737 dynbuf_text buf; 735 dynbuf_text buf;
738 736
739 player *pl = ob->contr;
740
741 if (pl->ranged_skill)
742 {
743 buf.printf (" Range: %s", &pl->ranged_skill->name);
744
745 if (pl->ranged_ob) 737 if (pl->ranged_ob)
746 buf.printf (" (%s)", query_base_name (pl->ranged_ob, 0)); 738 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
747 }
748 739
749 if (pl->combat_skill)
750 {
751 buf.printf (" Combat: %s", &pl->combat_skill->name);
752
753 if (pl->combat_ob) 740 if (pl->combat_ob)
754 buf.printf (" (%s)", query_base_name (pl->combat_ob, 0)); 741 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
755 }
756 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
747 //TODO: maybe golem should become the current_weapon, quite simply?
757 if (pl->golem) 748 if (pl->golem)
758 buf.printf (" Golem: %s", &pl->golem->name); 749 buf << " Golem*: " << pl->golem->name;
759 750
760 strcpy (obuf, buf.linearise () + 1); 751 buf.linearise (obuf);
752 obuf [buf.size ()] = 0;
761} 753}
762 754
763#define AddIfInt64(Old,New,Type) if (Old != New) {\ 755#define AddIfInt64(Old,New,Type) if (Old != New) {\
764 Old = New; \ 756 Old = New; \
765 sl << uint8 (Type) << uint64 (New); \ 757 sl << uint8 (Type) << uint64 (New); \
… …
773#define AddIfShort(Old,New,Type) if (Old != New) {\ 765#define AddIfShort(Old,New,Type) if (Old != New) {\
774 Old = New; \ 766 Old = New; \
775 sl << uint8 (Type) << uint16 (New); \ 767 sl << uint8 (Type) << uint16 (New); \
776 } 768 }
777 769
778#define AddIfFloat(Old,New,Type) if (Old != New) {\ 770#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
779 Old = New; \ 771 Old = New; \
780 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 772 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
781 } 773 }
782 774
783#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 775#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
784 free(Old); Old = strdup (New);\ 776 free(Old); Old = strdup (New);\
785 sl << uint8 (Type) << data8 (New); \ 777 sl << uint8 (Type) << data8 (New); \
… …
799 791
800 client *ns = pl->ns; 792 client *ns = pl->ns;
801 if (!ns) 793 if (!ns)
802 return; 794 return;
803 795
804 object *ob = pl->ob; 796 object *ob = pl->observe;
805 if (!ob) 797 if (!ob)
806 return; 798 return;
807 799
808 packet sl ("stats"); 800 packet sl ("stats");
809 801
… …
838 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 830 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
839 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 831 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
840 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 832 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
841 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 833 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
842 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 834 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
843 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 835 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
844 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 836 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
845 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);
846 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);
847 839
848 flags = 0; 840 flags = 0;
849 841
850 if (pl->fire_on) 842 if (pl->fire_on)
… …
872 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 864 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
873 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 865 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
874 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 866 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
875 } 867 }
876 868
877 rangetostring (ob, buf); /* we want use the new fire & run system in new client */ 869 rangetostring (pl, buf); /* we want use the new fire & run system in new client */
878 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 870 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
879 set_title (ob, buf); 871 set_title (ob, buf);
880 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 872 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
881 873
882 /* Only send it away if we have some actual data */ 874 /* Only send it away if we have some actual data */
… …
1016{ 1008{
1017 prefetch_surrounding_maps (op->map, 3); 1009 prefetch_surrounding_maps (op->map, 3);
1018} 1010}
1019 1011
1020/** 1012/**
1021 * This function uses the new map1 protocol command to send the map 1013 * Draws client map.
1022 * to the client. It is necessary because the old map command supports
1023 * a maximum map size of 15x15.
1024 * This function is much simpler than the old one. This is because
1025 * the old function optimized to send as few face identifiers as possible,
1026 * at the expense of sending more coordinate location (coordinates were
1027 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1028 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1029 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1030 * and use the other 4 bits for other informatiion. For full documentation
1031 * of what we send, see the doc/Protocol file.
1032 * I will describe internally what we do:
1033 * the ns->lastmap shows how the map last looked when sent to the client.
1034 * in the lastmap structure, there is a cells array, which is set to the
1035 * maximum viewable size (As set in config.h).
1036 * in the cells, there are faces and a count value.
1037 * we use the count value to hold the darkness value. If -1, then this space
1038 * is not viewable.
1039 * we use faces[0] faces[1] faces[2] to hold what the three layers
1040 * look like.
1041 */ 1014 */
1042void 1015void
1043draw_client_map1 (object *pl) 1016draw_client_map (player *pl)
1044{ 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
1045 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1031 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1046 sint16 nx, ny; 1032 sint16 nx, ny;
1047 int estartlen, eoldlen; 1033 int estartlen, eoldlen;
1048 uint8 eentrysize; 1034 uint8 eentrysize;
1049 uint16 ewhatstart, ewhatflag; 1035 uint16 ewhatstart, ewhatflag;
1050 uint8 extendedinfos; 1036 uint8 extendedinfos;
1051 maptile *m; 1037 maptile *m;
1052 1038
1053 client &socket = *pl->contr->ns;
1054
1055 if (!pl->active)
1056 return;
1057
1058 check_map_change (pl->contr); 1039 check_map_change (pl);
1059 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;
1060 1075
1061 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1076 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1062 packet esl; 1077 packet esl;
1063 1078
1064 startlen = sl.length (); 1079 startlen = sl.length ();
… …
1088 ay = 0; 1103 ay = 0;
1089 1104
1090 /* We could do this logic as conditionals in the if statement, 1105 /* We could do this logic as conditionals in the if statement,
1091 * but that started to get a bit messy to look at. 1106 * but that started to get a bit messy to look at.
1092 */ 1107 */
1093 max_x = pl->x + (socket.mapx + 1) / 2; 1108 max_x = ob->x + (socket.mapx + 1) / 2;
1094 max_y = pl->y + (socket.mapy + 1) / 2; 1109 max_y = ob->y + (socket.mapy + 1) / 2;
1095 1110
1096 maptile *plmap = pl->map;
1097
1098 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++)
1099 { 1112 {
1100 ax = 0; 1113 ax = 0;
1101 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++)
1102 { 1115 {
1103 int emask, mask; 1116 int emask, mask;
1104 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1117 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1105 1118
1106 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1119 MapCell &lastcell = socket.lastmap.cells[ax][ay];
… …
1127 continue; 1140 continue;
1128 } 1141 }
1129 1142
1130 m->touch (); 1143 m->touch ();
1131 1144
1132 int d = pl->contr->blocked_los[ax][ay]; 1145 int d = pl->blocked_los[ax][ay];
1133 1146
1134 if (d > 3) 1147 if (d > 3)
1135 { 1148 {
1136 1149
1137 int need_send = 0, count; 1150 int need_send = 0, count;
… …
1219 || 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))
1220 { 1233 {
1221 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)
1222 { 1235 {
1223 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1236 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1224 stat_width = op->arch->tail_x; 1237 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1225 } 1238 }
1226 } 1239 }
1227 1240
1228 if (op->msg && op->msg[0] == '@') 1241 if (op->msg && op->msg[0] == '@')
1229 flags |= 1; 1242 flags |= 1;
1230 1243
1231 if (op->type == PLAYER && op != pl) 1244 if (op->type == PLAYER && op != ob)
1232 player = op->count; 1245 player = op->count;
1233 } 1246 }
1234 1247
1235 if (lastcell.stat_hp != stat_hp) 1248 if (lastcell.stat_hp != stat_hp)
1236 { 1249 {
… …
1280 1293
1281 /* Middle face */ 1294 /* Middle face */
1282 if (update_space (sl, socket, ms, lastcell, 1)) 1295 if (update_space (sl, socket, ms, lastcell, 1))
1283 mask |= 0x2; 1296 mask |= 0x2;
1284 1297
1285 if (ms.player () == pl 1298 if (ms.player () == ob
1286 && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) 1299 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1287 { 1300 {
1288 // force player to be visible to himself if invisible 1301 // force player to be visible to himself if invisible
1289 if (lastcell.faces[0] != pl->face) 1302 if (lastcell.faces[0] != ob->face)
1290 { 1303 {
1291 lastcell.faces[0] = pl->face; 1304 lastcell.faces[0] = ob->face;
1292 1305
1293 mask |= 0x1; 1306 mask |= 0x1;
1294 sl << uint16 (pl->face); 1307 sl << uint16 (ob->face);
1295 1308
1296 socket.send_faces (pl); 1309 socket.send_faces (ob);
1297 } 1310 }
1298 } 1311 }
1299 /* Top face */ 1312 /* Top face */
1300 else if (update_space (sl, socket, ms, lastcell, 0)) 1313 else if (update_space (sl, socket, ms, lastcell, 0))
1301 mask |= 0x1; 1314 mask |= 0x1;
1302
1303 1315
1304 /* 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
1305 * space by checking the mask. If so, update the mask. 1317 * space by checking the mask. If so, update the mask.
1306 * 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
1307 * value, so we don't send those bits. 1319 * value, so we don't send those bits.
… …
1366 socket.send_packet (sl); 1378 socket.send_packet (sl);
1367 socket.sent_scroll = 0; 1379 socket.sent_scroll = 0;
1368 } 1380 }
1369} 1381}
1370 1382
1371/**
1372 * Draws client map.
1373 */
1374void
1375draw_client_map (object *pl)
1376{
1377 int i, j;
1378 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1379 int mflags;
1380 struct Map newmap;
1381 maptile *m, *pm;
1382
1383 if (pl->type != PLAYER)
1384 {
1385 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1386 return;
1387 }
1388
1389 pm = pl->map;
1390
1391 /* If player is just joining the game, he isn't here yet, so the map
1392 * can get swapped out. If so, don't try to send them a map. All will
1393 * be OK once they really log in.
1394 */
1395 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1396 return;
1397
1398 memset (&newmap, 0, sizeof (struct Map));
1399
1400 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1401 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1402 {
1403 ax = i;
1404 ay = j;
1405 m = pm;
1406 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1407
1408 if (mflags & P_OUT_OF_MAP)
1409 continue;
1410
1411 /* If a map is visible to the player, we don't want to swap it out
1412 * just to reload it. This should really call something like
1413 * swap_map, but this is much more efficient and 'good enough'
1414 */
1415 if (mflags & P_NEW_MAP)
1416 m->timeout = 50;
1417 }
1418
1419 /* do LOS after calls to update_position */
1420 if (pl->contr->do_los)
1421 {
1422 update_los (pl);
1423 pl->contr->do_los = 0;
1424 }
1425
1426 /* Big maps need a different drawing mechanism to work */
1427 draw_client_map1 (pl);
1428}
1429
1430
1431/*****************************************************************************/ 1383/*****************************************************************************/
1432
1433/* 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*/
1434
1435/* 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 */
1436
1437/* manage it ! */ 1386/* manage it ! */
1438
1439/*****************************************************************************/ 1387/*****************************************************************************/
1440void 1388void
1441send_plugin_custom_message (object *pl, char *buf) 1389send_plugin_custom_message (object *pl, char *buf)
1442{ 1390{
1443 pl->contr->ns->send_packet (buf); 1391 pl->contr->ns->send_packet (buf);

Diff Legend

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