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) 2001 Mark Wedel |
5 | * Copyright (C) 2001 Mark Wedel |
5 | Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (C) 1992 Frank Tore Johansen |
6 | |
7 | * |
7 | 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 |
8 | 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 |
9 | the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation; either version 2 of the License, or |
10 | (at your option) any later version. |
11 | * (at your option) any later version. |
11 | |
12 | * |
12 | 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, |
13 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
16 | |
17 | * |
17 | 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 |
18 | along with this program; if not, write to the Free Software |
19 | * along with this program; if not, write to the Free Software |
19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | |
21 | * |
21 | 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> |
22 | */ |
23 | */ |
23 | |
24 | |
24 | /** |
25 | /** |
25 | * \file |
26 | * \file |
26 | * Client handling. |
27 | * Client handling. |
27 | * |
28 | * |
… | |
… | |
35 | * 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 |
36 | * way, we can use one dispatch table. |
37 | * way, we can use one dispatch table. |
37 | * |
38 | * |
38 | * esrv_map_new starts updating the map |
39 | * esrv_map_new starts updating the map |
39 | * |
40 | * |
40 | * esrv_map_setbelow allows filling in all of the faces for the map. |
|
|
41 | * if a face has not already been sent to the client, it is sent now. |
|
|
42 | * |
|
|
43 | */ |
41 | */ |
44 | |
42 | |
45 | #include <global.h> |
43 | #include <global.h> |
46 | #include <sproto.h> |
44 | #include <sproto.h> |
47 | |
45 | |
… | |
… | |
146 | pl->ns->send_packet ("newmap"); |
144 | pl->ns->send_packet ("newmap"); |
147 | |
145 | |
148 | pl->ns->floorbox_reset (); |
146 | pl->ns->floorbox_reset (); |
149 | } |
147 | } |
150 | |
148 | |
151 | /** check for map change and send new map data */ |
149 | /** check for map/region change and send new map data */ |
152 | static void |
150 | static void |
153 | check_map_change (player *pl) |
151 | check_map_change (player *pl) |
154 | { |
152 | { |
155 | client &socket = *pl->ns; |
153 | client &socket = *pl->ns; |
156 | object *ob = pl->ob; |
154 | object *ob = pl->ob; |
… | |
… | |
176 | flags |= 4; |
174 | flags |= 4; |
177 | if (ob->map->tile_path[3]) |
175 | if (ob->map->tile_path[3]) |
178 | flags |= 8; |
176 | flags |= 8; |
179 | |
177 | |
180 | snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", |
178 | snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", |
181 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); |
179 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path); |
182 | } |
180 | } |
183 | else |
181 | else |
184 | snprintf (buf, MAX_BUF, "mapinfo current"); |
182 | snprintf (buf, MAX_BUF, "mapinfo current"); |
185 | |
183 | |
186 | socket.send_packet (buf); |
184 | socket.send_packet (buf); |
… | |
… | |
200 | } |
198 | } |
201 | } |
199 | } |
202 | |
200 | |
203 | socket.current_x = ob->x; |
201 | socket.current_x = ob->x; |
204 | 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 | } |
205 | } |
210 | } |
206 | |
211 | |
207 | /** |
212 | /** |
208 | * RequestInfo is sort of a meta command. There is some specific |
213 | * RequestInfo is sort of a meta command. There is some specific |
209 | * request of information, but we call other functions to provide |
214 | * request of information, but we call other functions to provide |
… | |
… | |
290 | { |
295 | { |
291 | int dir = *buf++; |
296 | int dir = *buf++; |
292 | |
297 | |
293 | switch (dir) |
298 | switch (dir) |
294 | { |
299 | { |
295 | case '1': |
300 | case '1': |
296 | dx = 0; |
301 | dx = 0; |
297 | dy = -1; |
302 | dy = -1; |
298 | map = get_map_from_coord (map, &dx, &dy); |
303 | map = map->xy_find (dx, dy); |
299 | map && (mapy -= map->height); |
304 | map && (mapy -= map->height); |
300 | break; |
305 | break; |
301 | case '2': |
306 | case '2': |
302 | mapx += map->width; |
307 | mapx += map->width; |
303 | dx = map->width; |
308 | dx = map->width; |
304 | dy = 0; |
309 | dy = 0; |
305 | map = get_map_from_coord (map, &dx, &dy); |
310 | map = map->xy_find (dx, dy); |
306 | break; |
311 | break; |
307 | case '3': |
312 | case '3': |
308 | mapy += map->height; |
313 | mapy += map->height; |
309 | dx = 0; |
314 | dx = 0; |
310 | dy = map->height; |
315 | dy = map->height; |
311 | map = get_map_from_coord (map, &dx, &dy); |
316 | map = map->xy_find (dx, dy); |
312 | break; |
317 | break; |
313 | case '4': |
318 | case '4': |
314 | dx = -1; |
319 | dx = -1; |
315 | dy = 0; |
320 | dy = 0; |
316 | map = get_map_from_coord (map, &dx, &dy); |
321 | map = map->xy_find (dx, dy); |
317 | map && (mapx -= map->width); |
322 | map && (mapx -= map->width); |
318 | break; |
323 | break; |
319 | } |
324 | } |
320 | |
325 | |
321 | --max_distance; |
326 | --max_distance; |
322 | } |
327 | } |
323 | |
328 | |
… | |
… | |
334 | if (map->tile_path[2]) |
339 | if (map->tile_path[2]) |
335 | flags |= 4; |
340 | flags |= 4; |
336 | if (map->tile_path[3]) |
341 | if (map->tile_path[3]) |
337 | flags |= 8; |
342 | flags |= 8; |
338 | |
343 | |
339 | snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); |
344 | snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); |
340 | } |
345 | } |
341 | else |
346 | else |
342 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
347 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
343 | } |
348 | } |
344 | else |
349 | else |
… | |
… | |
797 | * commands. |
802 | * commands. |
798 | */ |
803 | */ |
799 | pl->count = 0; |
804 | pl->count = 0; |
800 | |
805 | |
801 | //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 |
802 | int time = FABS (pl->ob->speed) < 0.001 |
807 | int time = fabs (pl->ob->speed) < 0.001 |
803 | ? time = MAX_TIME * 100 |
808 | ? time = MAX_TIME * 100 |
804 | : time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
809 | : time = (int) (MAX_TIME / fabs (pl->ob->speed)); |
805 | |
810 | |
806 | /* Send confirmation of command execution now */ |
811 | /* Send confirmation of command execution now */ |
807 | packet sl ("comc"); |
812 | packet sl ("comc"); |
808 | sl << uint16 (cmdid) << uint32 (time); |
813 | sl << uint16 (cmdid) << uint32 (time); |
809 | pl->ns->send_packet (sl); |
814 | pl->ns->send_packet (sl); |
… | |
… | |
845 | |
850 | |
846 | case ST_CHANGE_CLASS: |
851 | case ST_CHANGE_CLASS: |
847 | key_change_class (pl->ob, buf[0]); |
852 | key_change_class (pl->ob, buf[0]); |
848 | break; |
853 | break; |
849 | |
854 | |
850 | case ST_CONFIRM_QUIT: |
|
|
851 | key_confirm_quit (pl->ob, buf[0]); |
|
|
852 | break; |
|
|
853 | |
|
|
854 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
855 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
855 | receive_party_password (pl->ob, 13); |
856 | receive_party_password (pl->ob, 13); |
856 | break; |
857 | break; |
857 | |
858 | |
858 | default: |
859 | default: |
… | |
… | |
914 | { |
915 | { |
915 | ns->sound = atoi (buf); |
916 | ns->sound = atoi (buf); |
916 | } |
917 | } |
917 | |
918 | |
918 | /** client wants the map resent */ |
919 | /** client wants the map resent */ |
919 | |
|
|
920 | void |
920 | void |
921 | MapRedrawCmd (char *buf, int len, player *pl) |
921 | MapRedrawCmd (char *buf, int len, player *pl) |
922 | { |
922 | { |
923 | /* This function is currently disabled; just clearing the map state results in |
923 | /* This function is currently disabled; just clearing the map state results in |
924 | * display errors. It should clear the cache and send a newmap command. |
924 | * display errors. It should clear the cache and send a newmap command. |
… | |
… | |
1011 | esrv_update_stats (player *pl) |
1011 | esrv_update_stats (player *pl) |
1012 | { |
1012 | { |
1013 | char buf[MAX_BUF]; |
1013 | char buf[MAX_BUF]; |
1014 | uint16 flags; |
1014 | uint16 flags; |
1015 | |
1015 | |
|
|
1016 | client *ns = pl->ns; |
1016 | if (!pl->ns) |
1017 | if (!ns) |
1017 | return; |
1018 | return; |
1018 | |
1019 | |
|
|
1020 | object *ob = pl->ob; |
|
|
1021 | if (!ob) |
|
|
1022 | return; |
|
|
1023 | |
1019 | packet sl ("stats"); |
1024 | packet sl ("stats"); |
1020 | |
1025 | |
1021 | if (pl->ob) |
|
|
1022 | { |
|
|
1023 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
1026 | AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); |
1024 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
1027 | AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); |
1025 | AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); |
1028 | AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP); |
1026 | AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); |
1029 | AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP); |
1027 | AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); |
1030 | AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE); |
1028 | AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); |
1031 | AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE); |
1029 | AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); |
1032 | AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR); |
1030 | AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); |
1033 | AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX); |
1031 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
1034 | AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON); |
1032 | AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); |
1035 | AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); |
1033 | AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); |
1036 | AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); |
1034 | AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); |
1037 | AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); |
1035 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1038 | AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); |
1036 | } |
|
|
1037 | |
1039 | |
1038 | for (int s = 0; s < NUM_SKILLS; s++) |
1040 | for (int s = 0; s < NUM_SKILLS; s++) |
1039 | 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]) |
1040 | { |
1043 | { |
|
|
1044 | ns->last_skill_exp [s] = skill->stats.exp; |
|
|
1045 | |
1041 | /* Always send along the level if exp changes. This is only |
1046 | /* Always send along the level if exp changes. This is only |
1042 | * 1 extra byte, but keeps processing simpler. |
1047 | * 1 extra byte, but keeps processing simpler. |
1043 | */ |
1048 | */ |
1044 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1049 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1045 | << uint8 (pl->last_skill_ob[s]->level) |
1050 | << uint8 (skill->level) |
1046 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1051 | << uint64 (skill->stats.exp); |
1047 | |
|
|
1048 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
|
|
1049 | } |
1052 | } |
1050 | |
1053 | |
1051 | AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); |
1054 | AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); |
1052 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
1055 | AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); |
1053 | AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); |
1056 | AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); |
1054 | AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); |
1057 | AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); |
1055 | AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); |
1058 | AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); |
1056 | AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); |
1059 | AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); |
1057 | AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); |
1060 | AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); |
1058 | 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); |
1059 | 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 | |
1060 | flags = 0; |
1064 | flags = 0; |
1061 | |
1065 | |
1062 | if (pl->fire_on) |
1066 | if (pl->fire_on) |
1063 | flags |= SF_FIREON; |
1067 | flags |= SF_FIREON; |
1064 | |
1068 | |
1065 | if (pl->run_on) |
1069 | if (pl->run_on) |
1066 | flags |= SF_RUNON; |
1070 | flags |= SF_RUNON; |
1067 | |
1071 | |
1068 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1072 | AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); |
1069 | |
1073 | |
1070 | if (pl->ns->sc_version < 1025) |
1074 | if (ns->sc_version < 1025) |
1071 | { 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) } |
1072 | else |
1076 | else |
1073 | for (int i = 0; i < NROFATTACKS; i++) |
1077 | for (int i = 0; i < NROFATTACKS; i++) |
1074 | { |
1078 | { |
1075 | /* Skip ones we won't send */ |
1079 | /* Skip ones we won't send */ |
1076 | if (atnr_cs_stat[i] == -1) |
1080 | if (atnr_cs_stat[i] == -1) |
1077 | continue; |
1081 | continue; |
1078 | |
1082 | |
1079 | 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]); |
1080 | } |
1084 | } |
1081 | |
1085 | |
1082 | if (pl->ns->monitor_spells) |
1086 | if (pl->ns->monitor_spells) |
1083 | { |
1087 | { |
1084 | 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); |
1085 | 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); |
1086 | 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); |
1087 | } |
1091 | } |
1088 | |
1092 | |
1089 | 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 */ |
1090 | AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE); |
1094 | AddIfString (ns->stats.range, buf, CS_STAT_RANGE); |
1091 | set_title (pl->ob, buf); |
1095 | set_title (ob, buf); |
1092 | AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE); |
1096 | AddIfString (ns->stats.title, buf, CS_STAT_TITLE); |
1093 | |
1097 | |
1094 | /* Only send it away if we have some actual data */ |
1098 | /* Only send it away if we have some actual data */ |
1095 | if (sl.length () > 6) |
1099 | if (sl.length () > 6) |
1096 | pl->ns->send_packet (sl); |
1100 | ns->send_packet (sl); |
1097 | } |
1101 | } |
1098 | |
1102 | |
1099 | /** |
1103 | /** |
1100 | * 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. |
1101 | */ |
1105 | */ |
1102 | void |
1106 | void |
1103 | esrv_new_player (player *pl, uint32 weight) |
1107 | esrv_new_player (player *pl, uint32 weight) |
1104 | { |
1108 | { |
1105 | pl->last_weight = weight; |
|
|
1106 | |
|
|
1107 | packet sl ("player"); |
1109 | packet sl ("player"); |
1108 | |
1110 | |
1109 | sl << uint32 (pl->ob->count) |
1111 | sl << uint32 (pl->ob->count) |
1110 | << uint32 (weight) |
1112 | << uint32 (weight) |
1111 | << uint32 (pl->ob->face->number) |
1113 | << uint32 (pl->ob->face->number) |
1112 | << data8 (pl->ob->name); |
1114 | << data8 (pl->ob->name); |
1113 | |
1115 | |
|
|
1116 | pl->ns->last_weight = weight; |
1114 | pl->ns->send_packet (sl); |
1117 | pl->ns->send_packet (sl); |
1115 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1118 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1116 | } |
1119 | } |
1117 | |
1120 | |
1118 | /** |
1121 | /** |
… | |
… | |
1160 | /****************************************************************************** |
1163 | /****************************************************************************** |
1161 | * |
1164 | * |
1162 | * Start of map related commands. |
1165 | * Start of map related commands. |
1163 | * |
1166 | * |
1164 | ******************************************************************************/ |
1167 | ******************************************************************************/ |
1165 | |
|
|
1166 | /** |
|
|
1167 | * This adds face_num to a map cell at x,y. If the client doesn't have |
|
|
1168 | * the face yet, we will also send it. |
|
|
1169 | */ |
|
|
1170 | static void |
|
|
1171 | esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap) |
|
|
1172 | { |
|
|
1173 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
|
|
1174 | { |
|
|
1175 | //TODO: one or the other, can't both have abort and return, verify and act |
|
|
1176 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
|
|
1177 | return; |
|
|
1178 | abort (); |
|
|
1179 | } |
|
|
1180 | |
|
|
1181 | newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; |
|
|
1182 | newmap->cells[x][y].count++; |
|
|
1183 | |
|
|
1184 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
|
|
1185 | esrv_send_face (ns, face_num, 0); |
|
|
1186 | } |
|
|
1187 | |
1168 | |
1188 | /** Clears a map cell */ |
1169 | /** Clears a map cell */ |
1189 | static void |
1170 | static void |
1190 | 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) |
1191 | { |
1172 | { |
… | |
… | |
1506 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1487 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1507 | |
1488 | |
1508 | /* If there is no object for this space, or if the face for the object |
1489 | /* If there is no object for this space, or if the face for the object |
1509 | * is the blank face, set the smoothlevel to zero. |
1490 | * is the blank face, set the smoothlevel to zero. |
1510 | */ |
1491 | */ |
1511 | if (!ob || ob->face == blank_face || mp->nosmooth) |
1492 | if (!ob || ob->face == blank_face) |
1512 | smoothlevel = 0; |
1493 | smoothlevel = 0; |
1513 | else |
1494 | else |
1514 | { |
1495 | { |
1515 | smoothlevel = ob->smoothlevel; |
1496 | smoothlevel = ob->smoothlevel; |
1516 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
1497 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
… | |
… | |
1551 | if (ns->EMI_smooth) |
1532 | if (ns->EMI_smooth) |
1552 | result += 1; /*One byte for smoothlevel */ |
1533 | result += 1; /*One byte for smoothlevel */ |
1553 | } |
1534 | } |
1554 | |
1535 | |
1555 | return result; |
1536 | return result; |
|
|
1537 | } |
|
|
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); |
1556 | } |
1559 | } |
1557 | |
1560 | |
1558 | /** |
1561 | /** |
1559 | * 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 |
1560 | * 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 |
… | |
… | |
1589 | uint8 extendedinfos; |
1592 | uint8 extendedinfos; |
1590 | maptile *m; |
1593 | maptile *m; |
1591 | |
1594 | |
1592 | client &socket = *pl->contr->ns; |
1595 | client &socket = *pl->contr->ns; |
1593 | |
1596 | |
|
|
1597 | if (!pl->active) |
|
|
1598 | return; |
|
|
1599 | |
1594 | check_map_change (pl->contr); |
1600 | check_map_change (pl->contr); |
|
|
1601 | prefetch_surrounding_maps (pl); |
1595 | |
1602 | |
1596 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1603 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1597 | packet esl; |
1604 | packet esl; |
1598 | |
1605 | |
1599 | startlen = sl.length (); |
1606 | startlen = sl.length (); |
… | |
… | |
1718 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1725 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1719 | } |
1726 | } |
1720 | } |
1727 | } |
1721 | else if (d > 3) |
1728 | else if (d > 3) |
1722 | { |
1729 | { |
|
|
1730 | m->touch (); |
|
|
1731 | |
1723 | int need_send = 0, count; |
1732 | int need_send = 0, count; |
1724 | |
1733 | |
1725 | /* This block deals with spaces that are not visible for whatever |
1734 | /* This block deals with spaces that are not visible for whatever |
1726 | * reason. Still may need to send the head for this space. |
1735 | * reason. Still may need to send the head for this space. |
1727 | */ |
1736 | */ |
… | |
… | |
1760 | else |
1769 | else |
1761 | sl.reset (oldlen); |
1770 | sl.reset (oldlen); |
1762 | } |
1771 | } |
1763 | else |
1772 | else |
1764 | { |
1773 | { |
|
|
1774 | m->touch (); |
|
|
1775 | |
1765 | /* In this block, the space is visible or there are head objects |
1776 | /* In this block, the space is visible or there are head objects |
1766 | * we need to send. |
1777 | * we need to send. |
1767 | */ |
1778 | */ |
1768 | |
1779 | |
1769 | /* Rather than try to figure out what everything that we might |
1780 | /* Rather than try to figure out what everything that we might |
… | |
… | |
1962 | */ |
1973 | */ |
1963 | void |
1974 | void |
1964 | draw_client_map (object *pl) |
1975 | draw_client_map (object *pl) |
1965 | { |
1976 | { |
1966 | int i, j; |
1977 | int i, j; |
1967 | 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 */ |
1968 | New_Face *face, *floor; |
|
|
1969 | New_Face *floor2; |
|
|
1970 | int d, mflags; |
1979 | int mflags; |
1971 | struct Map newmap; |
1980 | struct Map newmap; |
1972 | maptile *m, *pm; |
1981 | maptile *m, *pm; |
1973 | |
1982 | |
1974 | if (pl->type != PLAYER) |
1983 | if (pl->type != PLAYER) |
1975 | { |
1984 | { |
… | |
… | |
2156 | |
2165 | |
2157 | /* 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. */ |
2158 | static void |
2167 | static void |
2159 | append_spell (player *pl, packet &sl, object *spell) |
2168 | append_spell (player *pl, packet &sl, object *spell) |
2160 | { |
2169 | { |
2161 | int len, i, skill = 0; |
2170 | int i, skill = 0; |
2162 | |
2171 | |
2163 | if (!(spell->name)) |
2172 | if (!(spell->name)) |
2164 | { |
2173 | { |
2165 | 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); |
2166 | return; |
2175 | return; |