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.59 by pippijn, Sat Jan 6 14:42:31 2007 UTC vs.
Revision 1.74 by root, Wed Mar 14 01:19:10 2007 UTC

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
… …
101 * that much difference in bandwidth. 98 * that much difference in bandwidth.
102 */ 99 */
103 mx = ns->mapx; 100 mx = ns->mapx;
104 my = ns->mapy; 101 my = ns->mapy;
105 102
106 if (ns->mapmode == Map1aCmd)
107 {
108 mx += MAX_HEAD_OFFSET;
109 my += MAX_HEAD_OFFSET;
110 }
111
112 /* the x and y here are coordinates for the new map, i.e. if we moved 103 /* the x and y here are coordinates for the new map, i.e. if we moved
113 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, 104 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
114 * if the destination x or y coordinate is outside the viewable 105 * if the destination x or y coordinate is outside the viewable
115 * area, we clear the values - otherwise, the old values 106 * area, we clear the values - otherwise, the old values
116 * are preserved, and the check_head thinks it needs to clear them. 107 * are preserved, and the check_head thinks it needs to clear them.
… …
147 pl->ns->send_packet ("newmap"); 138 pl->ns->send_packet ("newmap");
148 139
149 pl->ns->floorbox_reset (); 140 pl->ns->floorbox_reset ();
150} 141}
151 142
152/** check for map change and send new map data */ 143/** check for map/region change and send new map data */
153static void 144static void
154check_map_change (player *pl) 145check_map_change (player *pl)
155{ 146{
156 client &socket = *pl->ns; 147 client &socket = *pl->ns;
157 object *ob = pl->ob; 148 object *ob = pl->ob;
… …
201 } 192 }
202 } 193 }
203 194
204 socket.current_x = ob->x; 195 socket.current_x = ob->x;
205 socket.current_y = ob->y; 196 socket.current_y = ob->y;
197
198 region *reg = ob->region ();
199 if (socket.current_region != reg)
200 {
201 socket.current_region = reg;
202 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
203 }
206} 204}
207 205
208/** 206/**
209 * RequestInfo is sort of a meta command. There is some specific 207 * RequestInfo is sort of a meta command. There is some specific
210 * request of information, but we call other functions to provide 208 * request of information, but we call other functions to provide
… …
433 } 431 }
434 else if (!strcmp (cmd, "newmapcmd")) 432 else if (!strcmp (cmd, "newmapcmd"))
435 { 433 {
436 ns->newmapcmd = atoi (param); 434 ns->newmapcmd = atoi (param);
437 safe_strcat (cmdback, param, &slen, HUGE_BUF); 435 safe_strcat (cmdback, param, &slen, HUGE_BUF);
438// } else if (!strcmp(cmd,"plugincmd")) {
439// ns->plugincmd = atoi(param);
440// safe_strcat(cmdback, param, &slen, HUGE_BUF);
441 } 436 }
442 else if (!strcmp (cmd, "mapinfocmd")) 437 else if (!strcmp (cmd, "mapinfocmd"))
443 { 438 {
444 ns->mapinfocmd = atoi (param); 439 ns->mapinfocmd = atoi (param);
445 safe_strcat (cmdback, "1", &slen, HUGE_BUF); 440 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
… …
501 if (*cp == 'x' || *cp == 'X') 496 if (*cp == 'x' || *cp == 'X')
502 { 497 {
503 y = atoi (cp + 1); 498 y = atoi (cp + 1);
504 break; 499 break;
505 } 500 }
501
506 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y) 502 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
507 { 503 {
508 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); 504 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
509 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); 505 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
510 } 506 }
… …
687 683
688 ns->send_packet (cmdback); 684 ns->send_packet (cmdback);
689} 685}
690 686
691/** 687/**
692 * A lot like the old AskSmooth (in fact, now called by AskSmooth).
693 * Basically, it makes no sense to wait for the client to request a
694 * a piece of data from us that we know the client wants. So
695 * if we know the client wants it, might as well push it to the
696 * client.
697 */
698static void
699SendSmooth (client *ns, uint16 face)
700{
701 uint16 smoothface;
702
703 /* If we can't find a face, return and set it so we won't try to send this
704 * again.
705 */
706 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
707 {
708
709 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name);
710 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
711 return;
712 }
713
714 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
715 esrv_send_face (ns, smoothface, 0);
716
717 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
718
719 packet sl ("smooth");
720
721 sl << uint16 (face)
722 << uint16 (smoothface);
723
724 ns->send_packet (sl);
725}
726
727 /**
728 * Tells client the picture it has to use 688 * Tells client the picture it has to use
729 * to smooth a picture number given as argument. 689 * to smooth a picture number given as argument.
730 */ 690 */
731void 691void
732AskSmooth (char *buf, int len, client *ns) 692AskSmooth (char *buf, int len, client *ns)
733{ 693{
734 SendSmooth (ns, atoi (buf)); 694 ns->send_face (atoi (buf));
735} 695}
736 696
737/** 697/**
738 * This handles the general commands from the client (ie, north, fire, cast, 698 * This handles the general commands from the client (ie, north, fire, cast,
739 * etc.) 699 * etc.)
… …
798 * commands. 758 * commands.
799 */ 759 */
800 pl->count = 0; 760 pl->count = 0;
801 761
802 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 762 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
803 int time = FABS (pl->ob->speed) < 0.001 763 int time = fabs (pl->ob->speed) < 0.001
804 ? time = MAX_TIME * 100 764 ? time = MAX_TIME * 100
805 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 765 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
806 766
807 /* Send confirmation of command execution now */ 767 /* Send confirmation of command execution now */
808 packet sl ("comc"); 768 packet sl ("comc");
809 sl << uint16 (cmdid) << uint32 (time); 769 sl << uint16 (cmdid) << uint32 (time);
810 pl->ns->send_packet (sl); 770 pl->ns->send_packet (sl);
… …
846 806
847 case ST_CHANGE_CLASS: 807 case ST_CHANGE_CLASS:
848 key_change_class (pl->ob, buf[0]); 808 key_change_class (pl->ob, buf[0]);
849 break; 809 break;
850 810
851 case ST_CONFIRM_QUIT:
852 key_confirm_quit (pl->ob, buf[0]);
853 break;
854
855 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 811 case ST_GET_PARTY_PASSWORD: /* Get password for party */
856 receive_party_password (pl->ob, 13); 812 receive_party_password (pl->ob, 13);
857 break; 813 break;
858 814
859 default: 815 default:
… …
879 835
880 ns->cs_version = atoi (buf); 836 ns->cs_version = atoi (buf);
881 ns->sc_version = ns->cs_version; 837 ns->sc_version = ns->cs_version;
882 838
883 LOG (llevDebug, "connection from client <%s>\n", buf); 839 LOG (llevDebug, "connection from client <%s>\n", buf);
884
885 840
886 //TODO: should log here just for statistics 841 //TODO: should log here just for statistics
887 842
888 //if (VERSION_CS != ns->cs_version) 843 //if (VERSION_CS != ns->cs_version)
889 // unchecked; 844 // unchecked;
… …
1011esrv_update_stats (player *pl) 966esrv_update_stats (player *pl)
1012{ 967{
1013 char buf[MAX_BUF]; 968 char buf[MAX_BUF];
1014 uint16 flags; 969 uint16 flags;
1015 970
971 client *ns = pl->ns;
1016 if (!pl->ns) 972 if (!ns)
1017 return; 973 return;
1018 974
975 object *ob = pl->ob;
976 if (!ob)
977 return;
978
1019 packet sl ("stats"); 979 packet sl ("stats");
1020 980
1021 if (pl->ob)
1022 {
1023 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 981 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1024 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 982 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1025 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 983 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1026 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 984 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1027 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 985 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1028 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 986 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1029 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 987 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1030 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 988 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1031 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 989 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1032 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); 990 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1033 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); 991 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1034 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); 992 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1035 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 993 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1036 }
1037 994
1038 for (int s = 0; s < NUM_SKILLS; s++) 995 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) 996 if (object *skill = pl->last_skill_ob[s])
997 if (skill->stats.exp != ns->last_skill_exp [s])
1040 { 998 {
999 ns->last_skill_exp [s] = skill->stats.exp;
1000
1041 /* Always send along the level if exp changes. This is only 1001 /* Always send along the level if exp changes. This is only
1042 * 1 extra byte, but keeps processing simpler. 1002 * 1 extra byte, but keeps processing simpler.
1043 */ 1003 */
1044 sl << uint8 (s + CS_STAT_SKILLINFO) 1004 sl << uint8 (s + CS_STAT_SKILLINFO)
1045 << uint8 (pl->last_skill_ob[s]->level) 1005 << uint8 (skill->level)
1046 << uint64 (pl->last_skill_ob[s]->stats.exp); 1006 << uint64 (skill->stats.exp);
1047
1048 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1049 } 1007 }
1050 1008
1051 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); 1009 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1052 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1010 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1053 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1011 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1054 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1012 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1055 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1013 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1056 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1014 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1057 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1015 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1058 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 1016 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); 1017 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1018
1060 flags = 0; 1019 flags = 0;
1061 1020
1062 if (pl->fire_on) 1021 if (pl->fire_on)
1063 flags |= SF_FIREON; 1022 flags |= SF_FIREON;
1064 1023
1065 if (pl->run_on) 1024 if (pl->run_on)
1066 flags |= SF_RUNON; 1025 flags |= SF_RUNON;
1067 1026
1068 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1027 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1069 1028
1070 if (pl->ns->sc_version < 1025) 1029 if (ns->sc_version < 1025)
1071 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1030 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1072 else 1031 else
1073 for (int i = 0; i < NROFATTACKS; i++) 1032 for (int i = 0; i < NROFATTACKS; i++)
1074 { 1033 {
1075 /* Skip ones we won't send */ 1034 /* Skip ones we won't send */
1076 if (atnr_cs_stat[i] == -1) 1035 if (atnr_cs_stat[i] == -1)
1077 continue; 1036 continue;
1078 1037
1079 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1038 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1080 } 1039 }
1081 1040
1082 if (pl->ns->monitor_spells) 1041 if (pl->ns->monitor_spells)
1083 { 1042 {
1084 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1043 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); 1044 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); 1045 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1087 } 1046 }
1088 1047
1089 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1048 rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1090 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE); 1049 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1091 set_title (pl->ob, buf); 1050 set_title (ob, buf);
1092 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE); 1051 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1093 1052
1094 /* Only send it away if we have some actual data */ 1053 /* Only send it away if we have some actual data */
1095 if (sl.length () > 6) 1054 if (sl.length () > 6)
1096 pl->ns->send_packet (sl); 1055 ns->send_packet (sl);
1097} 1056}
1098 1057
1099/** 1058/**
1100 * Tells the client that here is a player it should start using. 1059 * Tells the client that here is a player it should start using.
1101 */ 1060 */
1102void 1061void
1103esrv_new_player (player *pl, uint32 weight) 1062esrv_new_player (player *pl, uint32 weight)
1104{ 1063{
1105 pl->last_weight = weight;
1106
1107 packet sl ("player"); 1064 packet sl ("player");
1108 1065
1109 sl << uint32 (pl->ob->count) 1066 sl << uint32 (pl->ob->count)
1110 << uint32 (weight) 1067 << uint32 (weight)
1111 << uint32 (pl->ob->face->number) 1068 << uint32 (pl->ob->face)
1112 << data8 (pl->ob->name); 1069 << data8 (pl->ob->name);
1113 1070
1071 pl->ns->last_weight = weight;
1114 pl->ns->send_packet (sl); 1072 pl->ns->send_packet (sl);
1115 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1073 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1116} 1074}
1117
1118/**
1119 * Need to send an animation sequence to the client.
1120 * We will send appropriate face commands to the client if we haven't
1121 * sent them the face yet (this can become quite costly in terms of
1122 * how much we are sending - on the other hand, this should only happen
1123 * when the player logs in and picks stuff up.
1124 */
1125void
1126esrv_send_animation (client * ns, short anim_num)
1127{
1128 /* Do some checking on the anim_num we got. Note that the animations
1129 * are added in contigous order, so if the number is in the valid
1130 * range, it must be a valid animation.
1131 */
1132 if (anim_num < 0 || anim_num > num_animations)
1133 {
1134 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1135 return;
1136 }
1137
1138 packet sl ("anim");
1139
1140 sl << uint16 (anim_num)
1141 << uint16 (0); /* flags - not used right now */
1142
1143 /* Build up the list of faces. Also, send any information (ie, the
1144 * the face itself) down to the client.
1145 */
1146 for (int i = 0; i < animations[anim_num].num_animations; i++)
1147 {
1148 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1149 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1150
1151 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1152 }
1153
1154 ns->send_packet (sl);
1155
1156 ns->anims_sent[anim_num] = 1;
1157}
1158
1159 1075
1160/****************************************************************************** 1076/******************************************************************************
1161 * 1077 *
1162 * Start of map related commands. 1078 * Start of map related commands.
1163 * 1079 *
1164 ******************************************************************************/ 1080 ******************************************************************************/
1165 1081
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 */
1170static void
1171esrv_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 */ 1082/** Clears a map cell */
1189static void 1083static void
1190map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1084map_clearcell (struct MapCell *cell, int count)
1191{ 1085{
1192 cell->faces[0] = face0; 1086 cell->faces[0] = 0;
1193 cell->faces[1] = face1; 1087 cell->faces[1] = 0;
1194 cell->faces[2] = face2; 1088 cell->faces[2] = 0;
1195 cell->count = count; 1089 cell->count = count;
1196 cell->stat_hp = 0; 1090 cell->stat_hp = 0;
1197 cell->flags = 0; 1091 cell->flags = 0;
1198 cell->player = 0; 1092 cell->player = 0;
1199} 1093}
1200 1094
1201#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1202#define MAX_LAYERS 3 1095#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 */
1210static 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 */
1217static inline int
1218have_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 */
1234static int
1235check_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 1096
1258/** 1097/**
1259 * Removes the need to replicate the same code for each layer. 1098 * Removes the need to replicate the same code for each layer.
1260 * this returns true if this space is now in fact different than 1099 * this returns true if this space is now in fact different than
1261 * it was. 1100 * it was.
… …
1275 * actually match. 1114 * actually match.
1276 */ 1115 */
1277static int 1116static int
1278update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1117update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1279{ 1118{
1280 object *ob, *head;
1281 uint16 face_num; 1119 uint16 face_num;
1282 int bx, by, i; 1120 int bx, by, i;
1283 1121
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); 1122 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1323 1123
1324 /* If there is no object for this space, or if the face for the object 1124 /* 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. 1125 * is the blank face, set the face number to zero.
1326 * else if we have the stored head object for this space, that takes 1126 * else if we have the stored head object for this space, that takes
1327 * precedence over the other object for this space. 1127 * precedence over the other object for this space.
1328 * otherwise, we do special head processing 1128 * otherwise, we do special head processing
1329 */ 1129 */
1330 if (!ob || ob->face == blank_face) 1130 if (!ob || ob->face == blank_face)
1331 face_num = 0; 1131 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 1132 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, 1133 /* In this case, we are already at the lower right or single part object,
1432 * so nothing special 1134 * 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 */ 1135 */
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; 1136 face_num = ob->face;
1463 1137
1464 /* We've gotten what face we want to use for the object. Now see if 1138 /* 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. 1139 * if it has changed since we last sent it to the client.
1466 */ 1140 */
1467 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 1141 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
1468 { 1142 {
1469 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 1143 ns.lastmap.cells[sx][sy].faces[layer] = face_num;
1144
1470 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1145 if (!ns.faces_sent[face_num])
1146 if (ob)
1147 ns.send_faces (ob);
1148 else
1471 esrv_send_face (&ns, face_num, 0); 1149 ns.send_face (face_num);
1472 1150
1473 sl << uint16 (face_num); 1151 sl << uint16 (face_num);
1474 return 1; 1152 return 1;
1475 } 1153 }
1476 1154
… …
1494 * holds the old values. 1172 * holds the old values.
1495 * layer is the layer to update, with 2 being the floor and 0 the 1173 * layer is the layer to update, with 2 being the floor and 0 the
1496 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1174 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1497 * take. 1175 * take.
1498 */ 1176 */
1499
1500static inline int 1177static inline int
1501update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1178update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1502{ 1179{
1503 object *ob;
1504 int smoothlevel; /* old face_num; */
1505
1506 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1180 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1507 1181
1508 /* If there is no object for this space, or if the face for the object 1182 /* 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. 1183 * is the blank face, set the smoothlevel to zero.
1510 */ 1184 */
1511 if (!ob || ob->face == blank_face) 1185 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1512 smoothlevel = 0;
1513 else
1514 {
1515 smoothlevel = ob->smoothlevel;
1516 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1517 SendSmooth (&ns, ob->face->number);
1518 } /* else not already head object or blank face */
1519 1186
1520 /* We've gotten what face we want to use for the object. Now see if 1187 /* 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. 1188 * if it has changed since we last sent it to the client.
1522 */ 1189 */
1523 if (smoothlevel > 255) 1190 if (smoothlevel > 255)
… …
1551 if (ns->EMI_smooth) 1218 if (ns->EMI_smooth)
1552 result += 1; /*One byte for smoothlevel */ 1219 result += 1; /*One byte for smoothlevel */
1553 } 1220 }
1554 1221
1555 return result; 1222 return result;
1223}
1224
1225// prefetch (and touch) all maps within a specific distancd
1226static void
1227prefetch_surrounding_maps (maptile *map, int distance)
1228{
1229 map->last_access = runtime;
1230
1231 if (--distance)
1232 for (int dir = 4; --dir; )
1233 if (const shstr &path = map->tile_path [dir])
1234 if (maptile *&neigh = map->tile_map [dir])
1235 prefetch_surrounding_maps (neigh, distance);
1236 else
1237 neigh = maptile::find_async (path, map);
1238}
1239
1240// prefetch a generous area around the player
1241static void
1242prefetch_surrounding_maps (object *op)
1243{
1244 prefetch_surrounding_maps (op->map, 3);
1556} 1245}
1557 1246
1558/** 1247/**
1559 * This function uses the new map1 protocol command to send the map 1248 * 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 1249 * to the client. It is necessary because the old map command supports
… …
1578 * look like. 1267 * look like.
1579 */ 1268 */
1580void 1269void
1581draw_client_map1 (object *pl) 1270draw_client_map1 (object *pl)
1582{ 1271{
1583 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1272 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1584 sint16 nx, ny; 1273 sint16 nx, ny;
1585 int estartlen, eoldlen; 1274 int estartlen, eoldlen;
1586 uint16 mask, emask;
1587 uint8 eentrysize; 1275 uint8 eentrysize;
1588 uint16 ewhatstart, ewhatflag; 1276 uint16 ewhatstart, ewhatflag;
1589 uint8 extendedinfos; 1277 uint8 extendedinfos;
1590 maptile *m; 1278 maptile *m;
1591 1279
1592 client &socket = *pl->contr->ns; 1280 client &socket = *pl->contr->ns;
1593 1281
1594 if (!pl->active ()) 1282 if (!pl->active)
1595 return; 1283 return;
1596 1284
1597 check_map_change (pl->contr); 1285 check_map_change (pl->contr);
1286 prefetch_surrounding_maps (pl);
1598 1287
1599 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1288 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1600 packet esl; 1289 packet esl;
1601 1290
1602 startlen = sl.length (); 1291 startlen = sl.length ();
… …
1625 ewhatstart = 0; 1314 ewhatstart = 0;
1626 ewhatflag = 0; 1315 ewhatflag = 0;
1627 estartlen = 0; 1316 estartlen = 0;
1628 } 1317 }
1629 1318
1630 /* Init data to zero */
1631 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1632
1633 /* x,y are the real map locations. ax, ay are viewport relative 1319 /* x,y are the real map locations. ax, ay are viewport relative
1634 * locations. 1320 * locations.
1635 */ 1321 */
1636 ay = 0; 1322 ay = 0;
1637 1323
… …
1639 * but that started to get a bit messy to look at. 1325 * but that started to get a bit messy to look at.
1640 */ 1326 */
1641 max_x = pl->x + (socket.mapx + 1) / 2; 1327 max_x = pl->x + (socket.mapx + 1) / 2;
1642 max_y = pl->y + (socket.mapy + 1) / 2; 1328 max_y = pl->y + (socket.mapy + 1) / 2;
1643 1329
1644 if (socket.mapmode == Map1aCmd)
1645 {
1646 max_x += MAX_HEAD_OFFSET;
1647 max_y += MAX_HEAD_OFFSET;
1648 }
1649
1650 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1330 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1651 { 1331 {
1652 ax = 0; 1332 ax = 0;
1653 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1333 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1654 { 1334 {
1335 int emask, mask;
1655 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1336 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1656 1337
1657 /* If this space is out of the normal viewable area, we only check
1658 * the heads value ax or ay will only be greater than what
1659 * the client wants if using the map1a command - this is because
1660 * if the map1a command is not used, max_x and max_y will be
1661 * set to lower values.
1662 */
1663 if (ax >= socket.mapx || ay >= socket.mapy)
1664 {
1665 int i, got_one;
1666
1667 oldlen = sl.length ();
1668
1669 sl << uint16 (mask);
1670
1671 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1672 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1673 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1674
1675 /* If all we are doing is sending 0 (blank) faces, we don't
1676 * actually need to send that - just the coordinates
1677 * with no faces tells the client to blank out the
1678 * space.
1679 */
1680 got_one = 0;
1681 for (i = oldlen + 2; i < sl.length (); i++)
1682 if (sl[i])
1683 got_one = 1;
1684
1685 if (got_one && (mask & 0xf))
1686 sl[oldlen + 1] = mask & 0xff;
1687 else
1688 { /*either all faces blank, either no face at all */
1689 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1690 sl.reset (oldlen + 2);
1691 else
1692 sl.reset (oldlen);
1693 }
1694
1695 /*What concerns extendinfos, nothing to be done for now
1696 * (perhaps effects layer later)
1697 */
1698 continue; /* don't do processing below */
1699 }
1700
1701 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1338 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1702
1703 d = pl->contr->blocked_los[ax][ay];
1704 1339
1705 /* If the coordinates are not valid, or it is too dark to see, 1340 /* If the coordinates are not valid, or it is too dark to see,
1706 * we tell the client as such 1341 * we tell the client as such
1707 */ 1342 */
1708 nx = x; 1343 nx = x;
… …
1716 * of the map, it shouldn't have a head 1351 * of the map, it shouldn't have a head
1717 */ 1352 */
1718 if (lastcell.count != -1) 1353 if (lastcell.count != -1)
1719 { 1354 {
1720 sl << uint16 (mask); 1355 sl << uint16 (mask);
1721 map_clearcell (&lastcell, 0, 0, 0, -1); 1356 map_clearcell (&lastcell, -1);
1722 } 1357 }
1358
1359 continue;
1723 } 1360 }
1361
1362 m->touch ();
1363
1364 int d = pl->contr->blocked_los[ax][ay];
1365
1724 else if (d > 3) 1366 if (d > 3)
1725 { 1367 {
1726 m->touch ();
1727 1368
1728 int need_send = 0, count; 1369 int need_send = 0, count;
1729 1370
1730 /* This block deals with spaces that are not visible for whatever 1371 /* This block deals with spaces that are not visible for whatever
1731 * reason. Still may need to send the head for this space. 1372 * reason. Still may need to send the head for this space.
1732 */ 1373 */
1733 1374
1734 oldlen = sl.length (); 1375 oldlen = sl.length ();
1735 1376
1736 sl << uint16 (mask); 1377 sl << uint16 (mask);
… …
1738 if (lastcell.count != -1) 1379 if (lastcell.count != -1)
1739 need_send = 1; 1380 need_send = 1;
1740 1381
1741 count = -1; 1382 count = -1;
1742 1383
1743 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1744 {
1745 /* Now check to see if any heads need to be sent */
1746
1747 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1748 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1749 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1750
1751 lastcell.count = count;
1752 }
1753 else
1754 {
1755 /* properly clear a previously sent big face */ 1384 /* properly clear a previously sent big face */
1756 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1385 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1757 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1386 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1758 need_send = 1; 1387 need_send = 1;
1759 1388
1760 map_clearcell (&lastcell, 0, 0, 0, count); 1389 map_clearcell (&lastcell, count);
1761 }
1762 1390
1763 if ((mask & 0xf) || need_send) 1391 if ((mask & 0xf) || need_send)
1764 sl[oldlen + 1] = mask & 0xff; 1392 sl[oldlen + 1] = mask & 0xff;
1765 else 1393 else
1766 sl.reset (oldlen); 1394 sl.reset (oldlen);
1767 } 1395 }
1768 else 1396 else
1769 { 1397 {
1770 m->touch ();
1771
1772 /* In this block, the space is visible or there are head objects 1398 /* In this block, the space is visible.
1773 * we need to send.
1774 */ 1399 */
1775 1400
1776 /* Rather than try to figure out what everything that we might 1401 /* Rather than try to figure out what everything that we might
1777 * need to send is, then form the packet after that, 1402 * need to send is, then form the packet after that,
1778 * we presume that we will in fact form a packet, and update 1403 * we presume that we will in fact form a packet, and update
… …
1781 * is done. 1406 * is done.
1782 * I think this is simpler than doing a bunch of checks to see 1407 * I think this is simpler than doing a bunch of checks to see
1783 * what if anything we need to send, setting the bits, then 1408 * what if anything we need to send, setting the bits, then
1784 * doing those checks again to add the real data. 1409 * doing those checks again to add the real data.
1785 */ 1410 */
1786 oldlen = sl.length (); 1411 oldlen = sl.length ();
1787 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1788 eoldlen = esl.length (); 1412 eoldlen = esl.length ();
1789 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1413
1790 sl << uint16 (mask); 1414 sl << uint16 (mask);
1791 1415
1792 if (socket.ext_mapinfos) 1416 if (socket.ext_mapinfos)
1793 esl << uint16 (emask); 1417 esl << uint16 (emask);
1794 1418
… …
1899 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1523 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
1900 emask |= 0x2; 1524 emask |= 0x2;
1901 1525
1902 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) 1526 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1903 { 1527 {
1904 if (lastcell.faces[0] != pl->face->number) 1528 if (lastcell.faces[0] != pl->face)
1905 { 1529 {
1906 lastcell.faces[0] = pl->face->number; 1530 lastcell.faces[0] = pl->face;
1907 mask |= 0x1; 1531 mask |= 0x1;
1908 1532
1909 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 1533 socket.send_faces (pl);
1910 esrv_send_face (&socket, pl->face->number, 0);
1911 1534
1912 sl << uint16 (pl->face->number); 1535 sl << uint16 (pl->face);
1913 } 1536 }
1914 } 1537 }
1915 else 1538 else
1916 { 1539 {
1917 /* Top face */ 1540 /* Top face */
… …
1947 if (!(sl.length () > startlen || socket.sent_scroll)) 1570 if (!(sl.length () > startlen || socket.sent_scroll))
1948 { 1571 {
1949 /* No map data will follow, so don't say the client 1572 /* No map data will follow, so don't say the client
1950 * it doesn't need draw! 1573 * it doesn't need draw!
1951 */ 1574 */
1952 ewhatflag &= (~EMI_NOREDRAW); 1575 ewhatflag &= ~EMI_NOREDRAW;
1953 esl[ewhatstart + 1] = ewhatflag & 0xff; 1576 esl[ewhatstart + 1] = ewhatflag & 0xff;
1954 } 1577 }
1955 1578
1956 if (esl.length () > estartlen) 1579 if (esl.length () > estartlen)
1957 socket.send_packet (esl); 1580 socket.send_packet (esl);
… …
1969 */ 1592 */
1970void 1593void
1971draw_client_map (object *pl) 1594draw_client_map (object *pl)
1972{ 1595{
1973 int i, j; 1596 int i, j;
1974 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 1597 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1975 New_Face *face, *floor;
1976 New_Face *floor2;
1977 int d, mflags; 1598 int mflags;
1978 struct Map newmap; 1599 struct Map newmap;
1979 maptile *m, *pm; 1600 maptile *m, *pm;
1980 1601
1981 if (pl->type != PLAYER) 1602 if (pl->type != PLAYER)
1982 { 1603 {
… …
2163 1784
2164/* appends the spell *spell to the Socklist we will send the data to. */ 1785/* appends the spell *spell to the Socklist we will send the data to. */
2165static void 1786static void
2166append_spell (player *pl, packet &sl, object *spell) 1787append_spell (player *pl, packet &sl, object *spell)
2167{ 1788{
2168 int len, i, skill = 0; 1789 int i, skill = 0;
2169 1790
2170 if (!(spell->name)) 1791 if (!(spell->name))
2171 { 1792 {
2172 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1793 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2173 return; 1794 return;
… …
2185 if (!strcmp (spell->skill, skill_names[i])) 1806 if (!strcmp (spell->skill, skill_names[i]))
2186 { 1807 {
2187 skill = i + CS_STAT_SKILLINFO; 1808 skill = i + CS_STAT_SKILLINFO;
2188 break; 1809 break;
2189 } 1810 }
1811 }
1812
1813 // spells better have a face
1814 if (!spell->face)
1815 {
1816 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1817 spell->face = face_find ("burnout.x11", blank_face);
2190 } 1818 }
2191 1819
2192 /* send the current values */ 1820 /* send the current values */
2193 sl << uint32 (spell->count) 1821 sl << uint32 (spell->count)
2194 << uint16 (spell->level) 1822 << uint16 (spell->level)
… …
2196 << uint16 (spell->last_sp) 1824 << uint16 (spell->last_sp)
2197 << uint16 (spell->last_grace) 1825 << uint16 (spell->last_grace)
2198 << uint16 (spell->last_eat) 1826 << uint16 (spell->last_eat)
2199 << uint8 (skill) 1827 << uint8 (skill)
2200 << uint32 (spell->path_attuned) 1828 << uint32 (spell->path_attuned)
2201 << uint32 (spell->face ? spell->face->number : 0) 1829 << uint32 (spell->face)
2202 << data8 (spell->name) 1830 << data8 (spell->name)
2203 << data16 (spell->msg); 1831 << data16 (spell->msg);
2204} 1832}
2205 1833
2206/** 1834/**
… …
2221 1849
2222 packet sl ("addspell"); 1850 packet sl ("addspell");
2223 1851
2224 if (!spell) 1852 if (!spell)
2225 { 1853 {
2226 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1854 for (spell = pl->ob->inv; spell; spell = spell->below)
2227 { 1855 {
2228 /* were we to simply keep appending data here, we could exceed 1856 /* were we to simply keep appending data here, we could exceed
2229 * MAXSOCKBUF if the player has enough spells to add, we know that 1857 * MAXSOCKBUF if the player has enough spells to add, we know that
2230 * append_spells will always append 19 data bytes, plus 4 length 1858 * append_spells will always append 19 data bytes, plus 4 length
2231 * bytes and 3 strings (because that is the spec) so we need to 1859 * bytes and 3 strings (because that is the spec) so we need to

Diff Legend

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