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 */ |
153 | static void |
150 | static void |
154 | check_map_change (player *pl) |
151 | check_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)", ®->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 | */ |
731 | void |
735 | void |
732 | AskSmooth (char *buf, int len, client *ns) |
736 | AskSmooth (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); |
… | |
… | |
1007 | esrv_update_stats (player *pl) |
1011 | esrv_update_stats (player *pl) |
1008 | { |
1012 | { |
1009 | char buf[MAX_BUF]; |
1013 | char buf[MAX_BUF]; |
1010 | uint16 flags; |
1014 | uint16 flags; |
1011 | |
1015 | |
|
|
1016 | client *ns = pl->ns; |
1012 | if (!pl->ns) |
1017 | if (!ns) |
1013 | return; |
1018 | return; |
1014 | |
1019 | |
|
|
1020 | object *ob = pl->ob; |
|
|
1021 | if (!ob) |
|
|
1022 | return; |
|
|
1023 | |
1015 | packet sl ("stats"); |
1024 | packet sl ("stats"); |
1016 | |
1025 | |
1017 | if (pl->ob) |
|
|
1018 | { |
|
|
1019 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
1026 | AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); |
1020 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
1027 | AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); |
1021 | AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); |
1028 | AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP); |
1022 | AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); |
1029 | AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP); |
1023 | AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); |
1030 | AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE); |
1024 | AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); |
1031 | AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE); |
1025 | AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); |
1032 | AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR); |
1026 | AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); |
1033 | AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX); |
1027 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
1034 | AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON); |
1028 | AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); |
1035 | AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); |
1029 | AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); |
1036 | AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); |
1030 | AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); |
1037 | AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); |
1031 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1038 | AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); |
1032 | } |
|
|
1033 | |
1039 | |
1034 | for (int s = 0; s < NUM_SKILLS; s++) |
1040 | for (int s = 0; s < NUM_SKILLS; s++) |
1035 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
1041 | if (object *skill = pl->last_skill_ob[s]) |
|
|
1042 | if (skill->stats.exp != ns->last_skill_exp [s]) |
1036 | { |
1043 | { |
|
|
1044 | ns->last_skill_exp [s] = skill->stats.exp; |
|
|
1045 | |
1037 | /* Always send along the level if exp changes. This is only |
1046 | /* Always send along the level if exp changes. This is only |
1038 | * 1 extra byte, but keeps processing simpler. |
1047 | * 1 extra byte, but keeps processing simpler. |
1039 | */ |
1048 | */ |
1040 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1049 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1041 | << uint8 (pl->last_skill_ob[s]->level) |
1050 | << uint8 (skill->level) |
1042 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1051 | << uint64 (skill->stats.exp); |
1043 | |
|
|
1044 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
|
|
1045 | } |
1052 | } |
1046 | |
1053 | |
1047 | AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); |
1054 | AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); |
1048 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
1055 | AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); |
1049 | AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); |
1056 | AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); |
1050 | AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); |
1057 | AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); |
1051 | AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); |
1058 | AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); |
1052 | AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); |
1059 | AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); |
1053 | AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); |
1060 | AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); |
1054 | AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); |
1061 | AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); |
1055 | AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); |
1062 | AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); |
|
|
1063 | |
1056 | flags = 0; |
1064 | flags = 0; |
1057 | |
1065 | |
1058 | if (pl->fire_on) |
1066 | if (pl->fire_on) |
1059 | flags |= SF_FIREON; |
1067 | flags |= SF_FIREON; |
1060 | |
1068 | |
1061 | if (pl->run_on) |
1069 | if (pl->run_on) |
1062 | flags |= SF_RUNON; |
1070 | flags |= SF_RUNON; |
1063 | |
1071 | |
1064 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1072 | AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); |
1065 | |
1073 | |
1066 | if (pl->ns->sc_version < 1025) |
1074 | if (ns->sc_version < 1025) |
1067 | { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1075 | { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1068 | else |
1076 | else |
1069 | for (int i = 0; i < NROFATTACKS; i++) |
1077 | for (int i = 0; i < NROFATTACKS; i++) |
1070 | { |
1078 | { |
1071 | /* Skip ones we won't send */ |
1079 | /* Skip ones we won't send */ |
1072 | if (atnr_cs_stat[i] == -1) |
1080 | if (atnr_cs_stat[i] == -1) |
1073 | continue; |
1081 | continue; |
1074 | |
1082 | |
1075 | AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); |
1083 | AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); |
1076 | } |
1084 | } |
1077 | |
1085 | |
1078 | if (pl->ns->monitor_spells) |
1086 | if (pl->ns->monitor_spells) |
1079 | { |
1087 | { |
1080 | AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1088 | AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1081 | AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); |
1089 | AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); |
1082 | AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); |
1090 | AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); |
1083 | } |
1091 | } |
1084 | |
1092 | |
1085 | rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ |
1093 | rangetostring (ob, buf); /* we want use the new fire & run system in new client */ |
1086 | AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE); |
1094 | AddIfString (ns->stats.range, buf, CS_STAT_RANGE); |
1087 | set_title (pl->ob, buf); |
1095 | set_title (ob, buf); |
1088 | AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE); |
1096 | AddIfString (ns->stats.title, buf, CS_STAT_TITLE); |
1089 | |
1097 | |
1090 | /* Only send it away if we have some actual data */ |
1098 | /* Only send it away if we have some actual data */ |
1091 | if (sl.length () > 6) |
1099 | if (sl.length () > 6) |
1092 | pl->ns->send_packet (sl); |
1100 | ns->send_packet (sl); |
1093 | } |
1101 | } |
1094 | |
1102 | |
1095 | /** |
1103 | /** |
1096 | * Tells the client that here is a player it should start using. |
1104 | * Tells the client that here is a player it should start using. |
1097 | */ |
1105 | */ |
1098 | void |
1106 | void |
1099 | esrv_new_player (player *pl, uint32 weight) |
1107 | esrv_new_player (player *pl, uint32 weight) |
1100 | { |
1108 | { |
1101 | pl->last_weight = weight; |
|
|
1102 | |
|
|
1103 | packet sl ("player"); |
1109 | packet sl ("player"); |
1104 | |
1110 | |
1105 | sl << uint32 (pl->ob->count) |
1111 | sl << uint32 (pl->ob->count) |
1106 | << uint32 (weight) |
1112 | << uint32 (weight) |
1107 | << uint32 (pl->ob->face->number) |
1113 | << uint32 (pl->ob->face->number) |
1108 | << data8 (pl->ob->name); |
1114 | << data8 (pl->ob->name); |
1109 | |
1115 | |
|
|
1116 | pl->ns->last_weight = weight; |
1110 | pl->ns->send_packet (sl); |
1117 | pl->ns->send_packet (sl); |
1111 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1118 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1112 | } |
1119 | } |
1113 | |
1120 | |
1114 | /** |
1121 | /** |
… | |
… | |
1156 | /****************************************************************************** |
1163 | /****************************************************************************** |
1157 | * |
1164 | * |
1158 | * Start of map related commands. |
1165 | * Start of map related commands. |
1159 | * |
1166 | * |
1160 | ******************************************************************************/ |
1167 | ******************************************************************************/ |
1161 | |
|
|
1162 | /** |
|
|
1163 | * This adds face_num to a map cell at x,y. If the client doesn't have |
|
|
1164 | * the face yet, we will also send it. |
|
|
1165 | */ |
|
|
1166 | static void |
|
|
1167 | esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap) |
|
|
1168 | { |
|
|
1169 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
|
|
1170 | { |
|
|
1171 | //TODO: one or the other, can't both have abort and return, verify and act |
|
|
1172 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
|
|
1173 | return; |
|
|
1174 | abort (); |
|
|
1175 | } |
|
|
1176 | |
|
|
1177 | newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; |
|
|
1178 | newmap->cells[x][y].count++; |
|
|
1179 | |
|
|
1180 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
|
|
1181 | esrv_send_face (ns, face_num, 0); |
|
|
1182 | } |
|
|
1183 | |
1168 | |
1184 | /** Clears a map cell */ |
1169 | /** Clears a map cell */ |
1185 | static void |
1170 | static void |
1186 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
1171 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
1187 | { |
1172 | { |
… | |
… | |
1549 | } |
1534 | } |
1550 | |
1535 | |
1551 | return result; |
1536 | return result; |
1552 | } |
1537 | } |
1553 | |
1538 | |
|
|
1539 | // prefetch (and touch) all maps within a specific distancd |
|
|
1540 | static void |
|
|
1541 | prefetch_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 |
|
|
1555 | static void |
|
|
1556 | prefetch_surrounding_maps (object *op) |
|
|
1557 | { |
|
|
1558 | prefetch_surrounding_maps (op->map, 3); |
|
|
1559 | } |
|
|
1560 | |
1554 | /** |
1561 | /** |
1555 | * 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 |
1556 | * 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 |
1557 | * a maximum map size of 15x15. |
1564 | * a maximum map size of 15x15. |
1558 | * This function is much simpler than the old one. This is because |
1565 | * This function is much simpler than the old one. This is because |
… | |
… | |
1589 | |
1596 | |
1590 | if (!pl->active) |
1597 | if (!pl->active) |
1591 | return; |
1598 | return; |
1592 | |
1599 | |
1593 | check_map_change (pl->contr); |
1600 | check_map_change (pl->contr); |
|
|
1601 | prefetch_surrounding_maps (pl); |
1594 | |
1602 | |
1595 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1603 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1596 | packet esl; |
1604 | packet esl; |
1597 | |
1605 | |
1598 | startlen = sl.length (); |
1606 | startlen = sl.length (); |
… | |
… | |
1965 | */ |
1973 | */ |
1966 | void |
1974 | void |
1967 | draw_client_map (object *pl) |
1975 | draw_client_map (object *pl) |
1968 | { |
1976 | { |
1969 | int i, j; |
1977 | int i, j; |
1970 | 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 */ |
1971 | New_Face *face, *floor; |
|
|
1972 | New_Face *floor2; |
|
|
1973 | int d, mflags; |
1979 | int mflags; |
1974 | struct Map newmap; |
1980 | struct Map newmap; |
1975 | maptile *m, *pm; |
1981 | maptile *m, *pm; |
1976 | |
1982 | |
1977 | if (pl->type != PLAYER) |
1983 | if (pl->type != PLAYER) |
1978 | { |
1984 | { |
… | |
… | |
2159 | |
2165 | |
2160 | /* 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. */ |
2161 | static void |
2167 | static void |
2162 | append_spell (player *pl, packet &sl, object *spell) |
2168 | append_spell (player *pl, packet &sl, object *spell) |
2163 | { |
2169 | { |
2164 | int len, i, skill = 0; |
2170 | int i, skill = 0; |
2165 | |
2171 | |
2166 | if (!(spell->name)) |
2172 | if (!(spell->name)) |
2167 | { |
2173 | { |
2168 | 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); |
2169 | return; |
2175 | return; |