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; |
… | |
… | |
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 | |
… | |
… | |
700 | uint16 smoothface; |
705 | uint16 smoothface; |
701 | |
706 | |
702 | /* 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 |
703 | * again. |
708 | * again. |
704 | */ |
709 | */ |
705 | if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) |
710 | if (!FindSmooth (face, &smoothface)) |
706 | { |
711 | { |
707 | |
712 | |
708 | 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); |
709 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
714 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
710 | return; |
715 | return; |
711 | } |
716 | } |
712 | |
717 | |
713 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
718 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
… | |
… | |
721 | << uint16 (smoothface); |
726 | << uint16 (smoothface); |
722 | |
727 | |
723 | ns->send_packet (sl); |
728 | ns->send_packet (sl); |
724 | } |
729 | } |
725 | |
730 | |
726 | /** |
731 | /** |
727 | * Tells client the picture it has to use |
732 | * Tells client the picture it has to use |
728 | * to smooth a picture number given as argument. |
733 | * to smooth a picture number given as argument. |
729 | */ |
734 | */ |
730 | void |
735 | void |
731 | AskSmooth (char *buf, int len, client *ns) |
736 | AskSmooth (char *buf, int len, client *ns) |
732 | { |
737 | { |
733 | SendSmooth (ns, atoi (buf)); |
738 | SendSmooth (ns, atoi (buf)); |
734 | } |
739 | } |
… | |
… | |
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) |
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 | /** |
… | |
… | |
1161 | * |
1164 | * |
1162 | * Start of map related commands. |
1165 | * Start of map related commands. |
1163 | * |
1166 | * |
1164 | ******************************************************************************/ |
1167 | ******************************************************************************/ |
1165 | |
1168 | |
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 | |
|
|
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 count) |
1191 | { |
1172 | { |
1192 | cell->faces[0] = face0; |
1173 | cell->faces[0] = 0; |
1193 | cell->faces[1] = face1; |
1174 | cell->faces[1] = 0; |
1194 | cell->faces[2] = face2; |
1175 | cell->faces[2] = 0; |
1195 | cell->count = count; |
1176 | cell->count = count; |
1196 | cell->stat_hp = 0; |
1177 | cell->stat_hp = 0; |
1197 | cell->flags = 0; |
1178 | cell->flags = 0; |
1198 | cell->player = 0; |
1179 | cell->player = 0; |
1199 | } |
1180 | } |
1200 | |
1181 | |
1201 | #define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) |
|
|
1202 | #define MAX_LAYERS 3 |
1182 | #define MAX_LAYERS 3 |
1203 | |
|
|
1204 | /* Using a global really isn't a good approach, but saves the over head of |
|
|
1205 | * allocating and deallocating such a block of data each time run through, |
|
|
1206 | * and saves the space of allocating this in the socket object when we only |
|
|
1207 | * need it for this cycle. If the server is ever threaded, this needs to be |
|
|
1208 | * re-examined. |
|
|
1209 | */ |
|
|
1210 | static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; |
|
|
1211 | |
|
|
1212 | /** |
|
|
1213 | * Returns true if any of the heads for this |
|
|
1214 | * space is set. Returns false if all are blank - this is used |
|
|
1215 | * for empty space checking. |
|
|
1216 | */ |
|
|
1217 | static inline int |
|
|
1218 | have_head (int ax, int ay) |
|
|
1219 | { |
|
|
1220 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || |
|
|
1221 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) |
|
|
1222 | return 1; |
|
|
1223 | |
|
|
1224 | return 0; |
|
|
1225 | } |
|
|
1226 | |
|
|
1227 | /** |
|
|
1228 | * check_head is a bit simplistic version of update_space below. |
|
|
1229 | * basically, it only checks the that the head on space ax,ay at layer |
|
|
1230 | * needs to get sent - if so, it adds the data, sending the head |
|
|
1231 | * if needed, and returning 1. If this no data needs to get |
|
|
1232 | * sent, it returns zero. |
|
|
1233 | */ |
|
|
1234 | static int |
|
|
1235 | check_head (packet &sl, client &ns, int ax, int ay, int layer) |
|
|
1236 | { |
|
|
1237 | short face_num; |
|
|
1238 | |
|
|
1239 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
|
|
1240 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
|
|
1241 | else |
|
|
1242 | face_num = 0; |
|
|
1243 | |
|
|
1244 | if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) |
|
|
1245 | { |
|
|
1246 | sl << uint16 (face_num); |
|
|
1247 | if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) |
|
|
1248 | esrv_send_face (&ns, face_num, 0); |
|
|
1249 | |
|
|
1250 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; |
|
|
1251 | ns.lastmap.cells[ax][ay].faces[layer] = face_num; |
|
|
1252 | return 1; |
|
|
1253 | } |
|
|
1254 | |
|
|
1255 | return 0; /* No change */ |
|
|
1256 | } |
|
|
1257 | |
1183 | |
1258 | /** |
1184 | /** |
1259 | * Removes the need to replicate the same code for each layer. |
1185 | * Removes the need to replicate the same code for each layer. |
1260 | * this returns true if this space is now in fact different than |
1186 | * this returns true if this space is now in fact different than |
1261 | * it was. |
1187 | * it was. |
… | |
… | |
1275 | * actually match. |
1201 | * actually match. |
1276 | */ |
1202 | */ |
1277 | static int |
1203 | static int |
1278 | update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1204 | update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1279 | { |
1205 | { |
1280 | object *ob, *head; |
|
|
1281 | uint16 face_num; |
1206 | uint16 face_num; |
1282 | int bx, by, i; |
1207 | int bx, by, i; |
1283 | |
1208 | |
1284 | /* If there is a multipart object stored away, treat that as more important. |
|
|
1285 | * If not, then do the normal processing. |
|
|
1286 | */ |
|
|
1287 | head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; |
|
|
1288 | |
|
|
1289 | /* Check to see if this head is part of the set of objects |
|
|
1290 | * we would normally send for this space. If so, then |
|
|
1291 | * don't use the head value. We need to do the check |
|
|
1292 | * here and not when setting up the heads[] value for two reasons - |
|
|
1293 | * 1) the heads[] values will get used even if the space is not visible. |
|
|
1294 | * 2) its possible the head is not on the same map as a part, and I'd |
|
|
1295 | * rather not need to do the map translation overhead. |
|
|
1296 | * 3) We need to do some extra checking to make sure that we will |
|
|
1297 | * otherwise send the image as this layer, eg, either it matches |
|
|
1298 | * the head value, or is not multipart. |
|
|
1299 | */ |
|
|
1300 | if (head && !head->more) |
|
|
1301 | { |
|
|
1302 | for (i = 0; i < MAP_LAYERS; i++) |
|
|
1303 | { |
|
|
1304 | ob = GET_MAP_FACE_OBJ (mp, mx, my, i); |
|
|
1305 | if (!ob) |
|
|
1306 | continue; |
|
|
1307 | |
|
|
1308 | if (ob->head) |
|
|
1309 | ob = ob->head; |
|
|
1310 | |
|
|
1311 | if (ob == head) |
|
|
1312 | { |
|
|
1313 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL; |
|
|
1314 | head = NULL; |
|
|
1315 | break; |
|
|
1316 | } |
|
|
1317 | } |
|
|
1318 | } |
|
|
1319 | |
|
|
1320 | ob = head; |
|
|
1321 | if (!ob) |
|
|
1322 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1209 | object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1323 | |
1210 | |
1324 | /* If there is no object for this space, or if the face for the object |
1211 | /* If there is no object for this space, or if the face for the object |
1325 | * is the blank face, set the face number to zero. |
1212 | * is the blank face, set the face number to zero. |
1326 | * else if we have the stored head object for this space, that takes |
1213 | * else if we have the stored head object for this space, that takes |
1327 | * precedence over the other object for this space. |
1214 | * precedence over the other object for this space. |
1328 | * otherwise, we do special head processing |
1215 | * otherwise, we do special head processing |
1329 | */ |
1216 | */ |
1330 | if (!ob || ob->face == blank_face) |
1217 | if (!ob || ob->face == blank_face) |
1331 | face_num = 0; |
1218 | face_num = 0; |
1332 | else if (head) |
|
|
1333 | { |
|
|
1334 | /* if this is a head that had previously been stored */ |
|
|
1335 | face_num = ob->face->number; |
|
|
1336 | } |
|
|
1337 | else |
1219 | else |
1338 | { |
|
|
1339 | /* if the faces for the different parts of a multipart object |
|
|
1340 | * are the same, we only want to send the bottom right most |
|
|
1341 | * portion of the object. That info is in the tail_.. values |
|
|
1342 | * of the head. Note that for the head itself, ob->head will |
|
|
1343 | * be null, so we only do this block if we are working on |
|
|
1344 | * a tail piece. |
|
|
1345 | */ |
|
|
1346 | |
|
|
1347 | /* tail_x and tail_y will only be set in the head object. If |
|
|
1348 | * this is the head object and these are set, we proceed |
|
|
1349 | * with logic to only send bottom right. Similarly, if |
|
|
1350 | * this is one of the more parts but the head has those values |
|
|
1351 | * set, we want to do the processing. There can be cases where |
|
|
1352 | * the head is not visible but one of its parts is, so we just |
|
|
1353 | * can always expect that ob->arch->tail_x will be true for all |
|
|
1354 | * object we may want to display. |
|
|
1355 | */ |
|
|
1356 | if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y))) |
|
|
1357 | { |
|
|
1358 | |
|
|
1359 | if (ob->head) |
|
|
1360 | head = ob->head; |
|
|
1361 | else |
|
|
1362 | head = ob; |
|
|
1363 | |
|
|
1364 | /* Basically figure out where the offset is from where we are right |
|
|
1365 | * now. the ob->arch->clone.{x,y} values hold the offset that this current |
|
|
1366 | * piece is from the head, and the tail is where the tail is from the |
|
|
1367 | * head. Note that bx and by will equal sx and sy if we are already working |
|
|
1368 | * on the bottom right corner. If ob is the head, the clone values |
|
|
1369 | * will be zero, so the right thing will still happen. |
|
|
1370 | */ |
|
|
1371 | bx = sx + head->arch->tail_x - ob->arch->clone.x; |
|
|
1372 | by = sy + head->arch->tail_y - ob->arch->clone.y; |
|
|
1373 | |
|
|
1374 | /* I don't think this can ever happen, but better to check for it just |
|
|
1375 | * in case. |
|
|
1376 | */ |
|
|
1377 | if (bx < sx || by < sy) |
|
|
1378 | { |
|
|
1379 | LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy); |
|
|
1380 | face_num = 0; |
|
|
1381 | } |
|
|
1382 | /* single part object, multipart object with non merged faces, |
|
|
1383 | * of multipart object already at lower right. |
|
|
1384 | */ |
|
|
1385 | else if (bx == sx && by == sy) |
|
|
1386 | { |
|
|
1387 | face_num = ob->face->number; |
|
|
1388 | |
|
|
1389 | /* if this face matches one stored away, clear that one away. |
|
|
1390 | * this code relies on the fact that the map1 commands |
|
|
1391 | * goes from 2 down to 0. |
|
|
1392 | */ |
|
|
1393 | for (i = 0; i < MAP_LAYERS; i++) |
|
|
1394 | if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] && |
|
|
1395 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num) |
|
|
1396 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL; |
|
|
1397 | } |
|
|
1398 | else |
|
|
1399 | { |
|
|
1400 | /* If this head is stored away, clear it - otherwise, |
|
|
1401 | * there can be cases where a object is on multiple layers - |
|
|
1402 | * we only want to send it once. |
|
|
1403 | */ |
|
|
1404 | face_num = head->face->number; |
|
|
1405 | for (i = 0; i < MAP_LAYERS; i++) |
|
|
1406 | if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] && |
|
|
1407 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num) |
|
|
1408 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL; |
|
|
1409 | |
|
|
1410 | /* First, try to put the new head on the same layer. If that is used up, |
|
|
1411 | * then find another layer. |
|
|
1412 | */ |
|
|
1413 | if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL) |
|
|
1414 | { |
|
|
1415 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head; |
|
|
1416 | } |
|
|
1417 | else |
|
|
1418 | for (i = 0; i < MAX_LAYERS; i++) |
|
|
1419 | { |
|
|
1420 | if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL || |
|
|
1421 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head) |
|
|
1422 | { |
|
|
1423 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head; |
|
|
1424 | } |
|
|
1425 | } |
|
|
1426 | face_num = 0; /* Don't send this object - we'll send the head later */ |
|
|
1427 | } |
|
|
1428 | } |
|
|
1429 | else |
|
|
1430 | { |
|
|
1431 | /* In this case, we are already at the lower right or single part object, |
1220 | /* In this case, we are already at the lower right or single part object, |
1432 | * so nothing special |
1221 | * so nothing special |
1433 | */ |
|
|
1434 | face_num = ob->face->number; |
|
|
1435 | |
|
|
1436 | /* clear out any head entries that have the same face as this one */ |
|
|
1437 | for (bx = 0; bx < layer; bx++) |
|
|
1438 | if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] && |
|
|
1439 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num) |
|
|
1440 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL; |
|
|
1441 | } |
|
|
1442 | } /* else not already head object or blank face */ |
|
|
1443 | |
|
|
1444 | /* This is a real hack. Basically, if we have nothing to send for this layer, |
|
|
1445 | * but there is a head on the next layer, send that instead. |
|
|
1446 | * Without this, what happens is you can get the case where the player stands |
|
|
1447 | * on the same space as the head. However, if you have overlapping big objects |
|
|
1448 | * of the same type, what happens then is it doesn't think it needs to send |
|
|
1449 | * This tends to make stacking also work/look better. |
|
|
1450 | */ |
1222 | */ |
1451 | if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]) |
|
|
1452 | { |
|
|
1453 | face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number; |
|
|
1454 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL; |
|
|
1455 | } |
|
|
1456 | |
|
|
1457 | /* Another hack - because of heads and whatnot, this face may match one |
|
|
1458 | * we already sent for a lower layer. In that case, don't send |
|
|
1459 | * this one. |
|
|
1460 | */ |
|
|
1461 | if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num) |
|
|
1462 | face_num = 0; |
1223 | face_num = ob->face; |
1463 | |
1224 | |
1464 | /* We've gotten what face we want to use for the object. Now see if |
1225 | /* We've gotten what face we want to use for the object. Now see if |
1465 | * if it has changed since we last sent it to the client. |
1226 | * if it has changed since we last sent it to the client. |
1466 | */ |
1227 | */ |
1467 | if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) |
1228 | if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) |
… | |
… | |
1511 | if (!ob || ob->face == blank_face) |
1272 | if (!ob || ob->face == blank_face) |
1512 | smoothlevel = 0; |
1273 | smoothlevel = 0; |
1513 | else |
1274 | else |
1514 | { |
1275 | { |
1515 | smoothlevel = ob->smoothlevel; |
1276 | smoothlevel = ob->smoothlevel; |
1516 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
1277 | if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH)) |
1517 | SendSmooth (&ns, ob->face->number); |
1278 | SendSmooth (&ns, ob->face); |
1518 | } /* else not already head object or blank face */ |
1279 | } /* else not already head object or blank face */ |
1519 | |
1280 | |
1520 | /* We've gotten what face we want to use for the object. Now see if |
1281 | /* We've gotten what face we want to use for the object. Now see if |
1521 | * if it has changed since we last sent it to the client. |
1282 | * if it has changed since we last sent it to the client. |
1522 | */ |
1283 | */ |
… | |
… | |
1551 | if (ns->EMI_smooth) |
1312 | if (ns->EMI_smooth) |
1552 | result += 1; /*One byte for smoothlevel */ |
1313 | result += 1; /*One byte for smoothlevel */ |
1553 | } |
1314 | } |
1554 | |
1315 | |
1555 | return result; |
1316 | return result; |
|
|
1317 | } |
|
|
1318 | |
|
|
1319 | // prefetch (and touch) all maps within a specific distancd |
|
|
1320 | static void |
|
|
1321 | prefetch_surrounding_maps (maptile *map, int distance) |
|
|
1322 | { |
|
|
1323 | map->last_access = runtime; |
|
|
1324 | |
|
|
1325 | if (--distance) |
|
|
1326 | for (int dir = 4; --dir; ) |
|
|
1327 | if (const shstr &path = map->tile_path [dir]) |
|
|
1328 | if (maptile *&neigh = map->tile_map [dir]) |
|
|
1329 | prefetch_surrounding_maps (neigh, distance); |
|
|
1330 | else |
|
|
1331 | neigh = maptile::find_async (path, map); |
|
|
1332 | } |
|
|
1333 | |
|
|
1334 | // prefetch a generous area around the player |
|
|
1335 | static void |
|
|
1336 | prefetch_surrounding_maps (object *op) |
|
|
1337 | { |
|
|
1338 | prefetch_surrounding_maps (op->map, 3); |
1556 | } |
1339 | } |
1557 | |
1340 | |
1558 | /** |
1341 | /** |
1559 | * This function uses the new map1 protocol command to send the map |
1342 | * 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 |
1343 | * to the client. It is necessary because the old map command supports |
… | |
… | |
1589 | uint8 extendedinfos; |
1372 | uint8 extendedinfos; |
1590 | maptile *m; |
1373 | maptile *m; |
1591 | |
1374 | |
1592 | client &socket = *pl->contr->ns; |
1375 | client &socket = *pl->contr->ns; |
1593 | |
1376 | |
|
|
1377 | if (!pl->active) |
|
|
1378 | return; |
|
|
1379 | |
1594 | check_map_change (pl->contr); |
1380 | check_map_change (pl->contr); |
|
|
1381 | prefetch_surrounding_maps (pl); |
1595 | |
1382 | |
1596 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1383 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1597 | packet esl; |
1384 | packet esl; |
1598 | |
1385 | |
1599 | startlen = sl.length (); |
1386 | startlen = sl.length (); |
… | |
… | |
1621 | /* suppress compiler warnings */ |
1408 | /* suppress compiler warnings */ |
1622 | ewhatstart = 0; |
1409 | ewhatstart = 0; |
1623 | ewhatflag = 0; |
1410 | ewhatflag = 0; |
1624 | estartlen = 0; |
1411 | estartlen = 0; |
1625 | } |
1412 | } |
1626 | |
|
|
1627 | /* Init data to zero */ |
|
|
1628 | memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS); |
|
|
1629 | |
1413 | |
1630 | /* x,y are the real map locations. ax, ay are viewport relative |
1414 | /* x,y are the real map locations. ax, ay are viewport relative |
1631 | * locations. |
1415 | * locations. |
1632 | */ |
1416 | */ |
1633 | ay = 0; |
1417 | ay = 0; |
… | |
… | |
1663 | |
1447 | |
1664 | oldlen = sl.length (); |
1448 | oldlen = sl.length (); |
1665 | |
1449 | |
1666 | sl << uint16 (mask); |
1450 | sl << uint16 (mask); |
1667 | |
1451 | |
1668 | if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; |
|
|
1669 | if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; |
|
|
1670 | if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1; |
|
|
1671 | |
|
|
1672 | /* If all we are doing is sending 0 (blank) faces, we don't |
1452 | /* If all we are doing is sending 0 (blank) faces, we don't |
1673 | * actually need to send that - just the coordinates |
1453 | * actually need to send that - just the coordinates |
1674 | * with no faces tells the client to blank out the |
1454 | * with no faces tells the client to blank out the |
1675 | * space. |
1455 | * space. |
1676 | */ |
1456 | */ |
… | |
… | |
1713 | * of the map, it shouldn't have a head |
1493 | * of the map, it shouldn't have a head |
1714 | */ |
1494 | */ |
1715 | if (lastcell.count != -1) |
1495 | if (lastcell.count != -1) |
1716 | { |
1496 | { |
1717 | sl << uint16 (mask); |
1497 | sl << uint16 (mask); |
1718 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1498 | map_clearcell (&lastcell, -1); |
1719 | } |
1499 | } |
1720 | } |
1500 | } |
1721 | else if (d > 3) |
1501 | else if (d > 3) |
1722 | { |
1502 | { |
1723 | m->touch (); |
1503 | m->touch (); |
… | |
… | |
1735 | if (lastcell.count != -1) |
1515 | if (lastcell.count != -1) |
1736 | need_send = 1; |
1516 | need_send = 1; |
1737 | |
1517 | |
1738 | count = -1; |
1518 | count = -1; |
1739 | |
1519 | |
1740 | if (socket.mapmode == Map1aCmd && have_head (ax, ay)) |
|
|
1741 | { |
|
|
1742 | /* Now check to see if any heads need to be sent */ |
|
|
1743 | |
|
|
1744 | if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; |
|
|
1745 | if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; |
|
|
1746 | if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1; |
|
|
1747 | |
|
|
1748 | lastcell.count = count; |
|
|
1749 | } |
|
|
1750 | else |
|
|
1751 | { |
|
|
1752 | /* properly clear a previously sent big face */ |
1520 | /* properly clear a previously sent big face */ |
1753 | if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 |
1521 | if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 |
1754 | || lastcell.stat_hp || lastcell.flags || lastcell.player) |
1522 | || lastcell.stat_hp || lastcell.flags || lastcell.player) |
1755 | need_send = 1; |
1523 | need_send = 1; |
1756 | |
1524 | |
1757 | map_clearcell (&lastcell, 0, 0, 0, count); |
1525 | map_clearcell (&lastcell, count); |
1758 | } |
|
|
1759 | |
1526 | |
1760 | if ((mask & 0xf) || need_send) |
1527 | if ((mask & 0xf) || need_send) |
1761 | sl[oldlen + 1] = mask & 0xff; |
1528 | sl[oldlen + 1] = mask & 0xff; |
1762 | else |
1529 | else |
1763 | sl.reset (oldlen); |
1530 | sl.reset (oldlen); |
… | |
… | |
1896 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) |
1663 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) |
1897 | emask |= 0x2; |
1664 | emask |= 0x2; |
1898 | |
1665 | |
1899 | if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) |
1666 | if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) |
1900 | { |
1667 | { |
1901 | if (lastcell.faces[0] != pl->face->number) |
1668 | if (lastcell.faces[0] != pl->face) |
1902 | { |
1669 | { |
1903 | lastcell.faces[0] = pl->face->number; |
1670 | lastcell.faces[0] = pl->face; |
1904 | mask |= 0x1; |
1671 | mask |= 0x1; |
1905 | |
1672 | |
1906 | if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) |
1673 | if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE)) |
1907 | esrv_send_face (&socket, pl->face->number, 0); |
1674 | esrv_send_face (&socket, pl->face, 0); |
1908 | |
1675 | |
1909 | sl << uint16 (pl->face->number); |
1676 | sl << uint16 (pl->face); |
1910 | } |
1677 | } |
1911 | } |
1678 | } |
1912 | else |
1679 | else |
1913 | { |
1680 | { |
1914 | /* Top face */ |
1681 | /* Top face */ |
… | |
… | |
1966 | */ |
1733 | */ |
1967 | void |
1734 | void |
1968 | draw_client_map (object *pl) |
1735 | draw_client_map (object *pl) |
1969 | { |
1736 | { |
1970 | int i, j; |
1737 | int i, j; |
1971 | sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ |
1738 | sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */ |
1972 | New_Face *face, *floor; |
|
|
1973 | New_Face *floor2; |
|
|
1974 | int d, mflags; |
1739 | int mflags; |
1975 | struct Map newmap; |
1740 | struct Map newmap; |
1976 | maptile *m, *pm; |
1741 | maptile *m, *pm; |
1977 | |
1742 | |
1978 | if (pl->type != PLAYER) |
1743 | if (pl->type != PLAYER) |
1979 | { |
1744 | { |
… | |
… | |
2160 | |
1925 | |
2161 | /* appends the spell *spell to the Socklist we will send the data to. */ |
1926 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2162 | static void |
1927 | static void |
2163 | append_spell (player *pl, packet &sl, object *spell) |
1928 | append_spell (player *pl, packet &sl, object *spell) |
2164 | { |
1929 | { |
2165 | int len, i, skill = 0; |
1930 | int i, skill = 0; |
2166 | |
1931 | |
2167 | if (!(spell->name)) |
1932 | if (!(spell->name)) |
2168 | { |
1933 | { |
2169 | LOG (llevError, "item number %d is a spell with no name.\n", spell->count); |
1934 | LOG (llevError, "item number %d is a spell with no name.\n", spell->count); |
2170 | return; |
1935 | return; |
… | |
… | |
2182 | if (!strcmp (spell->skill, skill_names[i])) |
1947 | if (!strcmp (spell->skill, skill_names[i])) |
2183 | { |
1948 | { |
2184 | skill = i + CS_STAT_SKILLINFO; |
1949 | skill = i + CS_STAT_SKILLINFO; |
2185 | break; |
1950 | break; |
2186 | } |
1951 | } |
|
|
1952 | } |
|
|
1953 | |
|
|
1954 | // spells better have a face |
|
|
1955 | if (!spell->face) |
|
|
1956 | { |
|
|
1957 | LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); |
|
|
1958 | spell->face = face_find ("burnout.x11", blank_face); |
2187 | } |
1959 | } |
2188 | |
1960 | |
2189 | /* send the current values */ |
1961 | /* send the current values */ |
2190 | sl << uint32 (spell->count) |
1962 | sl << uint32 (spell->count) |
2191 | << uint16 (spell->level) |
1963 | << uint16 (spell->level) |
… | |
… | |
2193 | << uint16 (spell->last_sp) |
1965 | << uint16 (spell->last_sp) |
2194 | << uint16 (spell->last_grace) |
1966 | << uint16 (spell->last_grace) |
2195 | << uint16 (spell->last_eat) |
1967 | << uint16 (spell->last_eat) |
2196 | << uint8 (skill) |
1968 | << uint8 (skill) |
2197 | << uint32 (spell->path_attuned) |
1969 | << uint32 (spell->path_attuned) |
2198 | << uint32 (spell->face ? spell->face->number : 0) |
1970 | << uint32 (spell->face) |
2199 | << data8 (spell->name) |
1971 | << data8 (spell->name) |
2200 | << data16 (spell->msg); |
1972 | << data16 (spell->msg); |
2201 | } |
1973 | } |
2202 | |
1974 | |
2203 | /** |
1975 | /** |
… | |
… | |
2218 | |
1990 | |
2219 | packet sl ("addspell"); |
1991 | packet sl ("addspell"); |
2220 | |
1992 | |
2221 | if (!spell) |
1993 | if (!spell) |
2222 | { |
1994 | { |
2223 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
1995 | for (spell = pl->ob->inv; spell; spell = spell->below) |
2224 | { |
1996 | { |
2225 | /* were we to simply keep appending data here, we could exceed |
1997 | /* were we to simply keep appending data here, we could exceed |
2226 | * MAXSOCKBUF if the player has enough spells to add, we know that |
1998 | * MAXSOCKBUF if the player has enough spells to add, we know that |
2227 | * append_spells will always append 19 data bytes, plus 4 length |
1999 | * append_spells will always append 19 data bytes, plus 4 length |
2228 | * bytes and 3 strings (because that is the spec) so we need to |
2000 | * bytes and 3 strings (because that is the spec) so we need to |