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.128 by root, Tue May 6 16:55:26 2008 UTC vs.
Revision 1.150 by root, Mon Oct 12 14:00:59 2009 UTC

… …
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * 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 Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/** 25/**
… …
98 */ 99 */
99 mx = ns->mapx; 100 mx = ns->mapx;
100 my = ns->mapy; 101 my = ns->mapy;
101 102
102 /* 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
103 * (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,
104 * if the destination x or y coordinate is outside the viewable 105 * if the destination x or y coordinate is outside the viewable
105 * area, we clear the values - otherwise, the old values 106 * area, we clear the values - otherwise, the old values
106 * 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.
107 */ 108 */
108 for (x = 0; x < mx; x++) 109 for (x = 0; x < mx; x++)
109 {
110 for (y = 0; y < my; y++) 110 for (y = 0; y < my; y++)
111 {
112 if (x >= ns->mapx || y >= ns->mapy) 111 if (x >= ns->mapx || y >= ns->mapy)
113 /* clear cells outside the viewable area */ 112 /* clear cells outside the viewable area */
114 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 113 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
115 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy) 114 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
116 /* clear newly visible tiles within the viewable area */ 115 /* clear newly visible tiles within the viewable area */
117 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 116 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
118 else 117 else
119 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 118 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
120 }
121 }
122 119
123 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 120 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
124 121
125 /* Make sure that the next "map1" command will be sent (even if it is 122 /* Make sure that the next "map1" command will be sent (even if it is
126 * empty). 123 * empty).
… …
141 pl->ns->send_packet ("newmap"); 138 pl->ns->send_packet ("newmap");
142 139
143 pl->ns->floorbox_reset (); 140 pl->ns->floorbox_reset ();
144} 141}
145 142
143static void
144send_map_info (player *pl)
145{
146 client &socket = *pl->ns;
147 object *ob = pl->observe;
148
149 if (socket.mapinfocmd)
150 {
151 if (ob->map && ob->map->path[0])
152 {
153 int flags = 0;
154
155 if (ob->map->tile_path[0]) flags |= 1;
156 if (ob->map->tile_path[1]) flags |= 2;
157 if (ob->map->tile_path[2]) flags |= 4;
158 if (ob->map->tile_path[3]) flags |= 8;
159
160 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
161 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
162 ob->map->width, ob->map->height, &ob->map->path);
163 }
164 else
165 socket.send_packet ("mapinfo current");
166 }
167}
168
146/** check for map/region change and send new map data */ 169/** check for map/region change and send new map data */
147static void 170static void
148check_map_change (player *pl) 171check_map_change (player *pl)
149{ 172{
150 client &socket = *pl->ns; 173 client &socket = *pl->ns;
151 object *ob = pl->observe; 174 object *ob = pl->observe;
152 175
176 region *reg = ob->region ();
177 if (socket.current_region != reg)
178 {
179 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
180 socket.current_region = reg;
181 }
182
183 // first try to aovid a full newmap on tiled map scrolls
184 if (socket.current_map != ob->map && !socket.force_newmap)
185 {
186 rv_vector rv;
187
188 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
189
190 // manhattan distance is very handy here
191 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
192 {
193 socket.current_map = ob->map;
194 socket.current_x = ob->x;
195 socket.current_y = ob->y;
196
197 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
198 socket.floorbox_reset ();
199 send_map_info (pl);
200 }
201 }
202
153 if (socket.current_map != ob->map || socket.force_newmap) 203 if (socket.current_map != ob->map || socket.force_newmap)
154 { 204 {
155 clear_map (pl); 205 clear_map (pl);
156 socket.current_map = ob->map; 206 socket.current_map = ob->map;
157 207 send_map_info (pl);
158 if (socket.mapinfocmd)
159 {
160 if (ob->map && ob->map->path[0])
161 {
162 int flags = 0;
163
164 if (ob->map->tile_path[0]) flags |= 1;
165 if (ob->map->tile_path[1]) flags |= 2;
166 if (ob->map->tile_path[2]) flags |= 4;
167 if (ob->map->tile_path[3]) flags |= 8;
168
169 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
170 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
171 ob->map->width, ob->map->height, &ob->map->path);
172 }
173 else
174 socket.send_packet ("mapinfo current");
175 }
176 } 208 }
177 else if (socket.current_x != ob->x || socket.current_y != ob->y) 209 else if (socket.current_x != ob->x || socket.current_y != ob->y)
178 { 210 {
179 int dx = ob->x - socket.current_x; 211 int dx = ob->x - socket.current_x;
180 int dy = ob->y - socket.current_y; 212 int dy = ob->y - socket.current_y;
181 213
182 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
183 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
184 else
185 {
186 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 214 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
187 socket.floorbox_reset (); 215 socket.floorbox_reset ();
188 }
189 } 216 }
190 217
191 socket.current_x = ob->x; 218 socket.current_x = ob->x;
192 socket.current_y = ob->y; 219 socket.current_y = ob->y;
193
194 region *reg = ob->region ();
195 if (socket.current_region != reg)
196 {
197 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
198 socket.current_region = reg;
199 }
200} 220}
201 221
202/** 222/**
203 * RequestInfo is sort of a meta command. There is some specific 223 * RequestInfo is sort of a meta command. There is some specific
204 * request of information, but we call other functions to provide 224 * request of information, but we call other functions to provide
… …
380AddMeCmd (char *buf, int len, client *ns) 400AddMeCmd (char *buf, int len, client *ns)
381{ 401{
382 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 402 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
383} 403}
384 404
385/** Reply to ExtendedInfos command */
386void
387ToggleExtendedInfos (char *buf, int len, client * ns)
388{
389 char cmdback[MAX_BUF];
390 char command[50];
391 int info, nextinfo;
392
393 cmdback[0] = '\0';
394 nextinfo = 0;
395
396 while (1)
397 {
398 /* 1. Extract an info */
399 info = nextinfo;
400
401 while ((info < len) && (buf[info] == ' '))
402 info++;
403
404 if (info >= len)
405 break;
406
407 nextinfo = info + 1;
408
409 while ((nextinfo < len) && (buf[nextinfo] != ' '))
410 nextinfo++;
411
412 if (nextinfo - info >= 49) /*Erroneous info asked */
413 continue;
414
415 strncpy (command, &(buf[info]), nextinfo - info);
416
417 /* 2. Interpret info */
418 if (!strcmp ("smooth", command))
419 /* Toggle smoothing */
420 ns->EMI_smooth = !ns->EMI_smooth;
421 else
422 /*bad value */;
423
424 /*3. Next info */
425 }
426
427 strcpy (cmdback, "ExtendedInfoSet");
428
429 if (ns->EMI_smooth)
430 {
431 strcat (cmdback, " ");
432 strcat (cmdback, "smoothing");
433 }
434
435 ns->send_packet (cmdback);
436}
437
438/* 405/*
439#define MSG_TYPE_BOOK 1 406#define MSG_TYPE_BOOK 1
440#define MSG_TYPE_CARD 2 407#define MSG_TYPE_CARD 2
441#define MSG_TYPE_PAPER 3 408#define MSG_TYPE_PAPER 3
442#define MSG_TYPE_SIGN 4 409#define MSG_TYPE_SIGN 4
… …
686 * syntax is: move (to) (tag) (nrof) 653 * syntax is: move (to) (tag) (nrof)
687 */ 654 */
688void 655void
689MoveCmd (char *buf, int len, player *pl) 656MoveCmd (char *buf, int len, player *pl)
690{ 657{
691 int vals[3], i; 658 int to, tag, nrof;
692 659
693 /* A little funky here. We only cycle for 2 records, because 660 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
694 * we obviously are not going to find a space after the third
695 * record. Perhaps we should just replace this with a
696 * sscanf?
697 */
698 for (i = 0; i < 2; i++)
699 { 661 {
700 vals[i] = atoi (buf);
701
702 if (!(buf = strchr (buf, ' ')))
703 {
704 LOG (llevError, "Incomplete move command: %s\n", buf); 662 LOG (llevError, "Incomplete move command: %s\n", buf);
705 return; 663 return;
706 }
707
708 buf++;
709 } 664 }
710 665
711 vals[2] = atoi (buf); 666 esrv_move_object (pl->ob, to, tag, nrof);
712
713/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
714 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
715} 667}
716 668
717/****************************************************************************** 669/******************************************************************************
718 * 670 *
719 * Start of commands the server sends to the client. 671 * Start of commands the server sends to the client.
… …
734 * Get player's current range attack in obuf. 686 * Get player's current range attack in obuf.
735 */ 687 */
736static void 688static void
737rangetostring (player *pl, char *obuf) 689rangetostring (player *pl, char *obuf)
738{ 690{
739 dynbuf_text buf; 691 dynbuf_text &buf = msg_dynbuf; buf.clear ();
740 692
741 if (pl->ranged_ob) 693 if (pl->ranged_ob)
742 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 694 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
743 695
744 if (pl->combat_ob) 696 if (pl->combat_ob)
… …
820 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 772 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
821 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 773 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
822 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 774 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
823 775
824 for (int s = 0; s < NUM_SKILLS; s++) 776 for (int s = 0; s < NUM_SKILLS; s++)
825 if (object *skill = opl->last_skill_ob[s]) 777 if (object *skill = opl->last_skill_ob [s])
826 if (skill->stats.exp != ns->last_skill_exp [s]) 778 if (skill->stats.exp != ns->last_skill_exp [s])
827 { 779 {
828 ns->last_skill_exp [s] = skill->stats.exp; 780 ns->last_skill_exp [s] = skill->stats.exp;
829 781
830 /* Always send along the level if exp changes. This is only 782 /* Always send along the level if exp changes. This is only
… …
899 << uint32 (pl->ob->face) 851 << uint32 (pl->ob->face)
900 << data8 (pl->ob->name); 852 << data8 (pl->ob->name);
901 853
902 pl->ns->last_weight = weight; 854 pl->ns->last_weight = weight;
903 pl->ns->send_packet (sl); 855 pl->ns->send_packet (sl);
904 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
905} 856}
906 857
907/****************************************************************************** 858/******************************************************************************
908 * 859 *
909 * Start of map related commands. 860 * Start of map related commands.
… …
976 927
977 /* Nothing changed */ 928 /* Nothing changed */
978 return 0; 929 return 0;
979} 930}
980 931
981/**
982 * Returns the size of a data for a map square as returned by
983 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
984 * available.
985 */
986int
987getExtendedMapInfoSize (client * ns)
988{
989 int result = 0;
990
991 if (ns->ext_mapinfos)
992 {
993 if (ns->EMI_smooth)
994 result += 1; /*One byte for smoothlevel */
995 }
996
997 return result;
998}
999
1000// prefetch (and touch) all maps within a specific distancd 932// prefetch (and touch) all maps within a specific distancd
1001static void 933static void
1002prefetch_surrounding_maps (maptile *map, int distance) 934prefetch_surrounding_maps (maptile *map, int distance)
1003{ 935{
1004 map->last_access = runtime; 936 map->touch ();
1005 937
1006 if (--distance) 938 if (--distance)
1007 for (int dir = 4; --dir; ) 939 for (int dir = 4; --dir; )
1008 if (const shstr &path = map->tile_path [dir]) 940 if (const shstr &path = map->tile_path [dir])
1009 if (maptile *&neigh = map->tile_map [dir]) 941 if (maptile *&neigh = map->tile_map [dir])
… …
1027{ 959{
1028 object *ob = pl->observe; 960 object *ob = pl->observe;
1029 if (!ob->active) 961 if (!ob->active)
1030 return; 962 return;
1031 963
1032 maptile *plmap = ob->map;
1033
1034 /* If player is just joining the game, he isn't here yet, so the map 964 /* If player is just joining the game, he isn't here yet, so the map
1035 * can get swapped out. If so, don't try to send them a map. All will 965 * can get swapped out. If so, don't try to send them a map. All will
1036 * be OK once they really log in. 966 * be OK once they really log in.
1037 */ 967 */
1038 if (!plmap || plmap->in_memory != MAP_ACTIVE) 968 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1039 return; 969 return;
1040 970
1041 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1042 int estartlen, eoldlen; 971 int startlen, oldlen;
1043 uint8 eentrysize;
1044 uint16 ewhatstart, ewhatflag;
1045 uint8 extendedinfos;
1046 972
1047 check_map_change (pl); 973 check_map_change (pl);
1048 prefetch_surrounding_maps (pl->ob); 974 prefetch_surrounding_maps (pl->ob);
1049 975
1050 /* do LOS after calls to update_position */ 976 /* do LOS after calls to update_position */
1051 if (ob != pl->ob) 977 /* unfortunately, we need to udpate los when observing, currently */
1052 clear_los (pl); 978 if (pl->do_los || pl->observe != pl->ob)
1053 else if (pl->do_los)
1054 { 979 {
1055 update_los (ob);
1056 pl->do_los = 0; 980 pl->do_los = 0;
981 pl->update_los ();
1057 } 982 }
1058 983
1059 /** 984 /**
1060 * This function uses the new map1 protocol command to send the map 985 * This function uses the new map1 protocol command to send the map
1061 * to the client. It is necessary because the old map command supports 986 * to the client. It is necessary because the old map command supports
… …
1080 */ 1005 */
1081 1006
1082 client &socket = *pl->ns; 1007 client &socket = *pl->ns;
1083 1008
1084 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1009 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1085 packet esl;
1086 1010
1087 startlen = sl.length (); 1011 startlen = sl.length ();
1088 1012
1089 /*Extendedmapinfo structure initialisation */ 1013 int hx = socket.mapx / 2;
1090 if (socket.ext_mapinfos) 1014 int hy = socket.mapy / 2;
1091 {
1092 extendedinfos = EMI_NOREDRAW;
1093 1015
1094 if (socket.EMI_smooth) 1016 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1095 extendedinfos |= EMI_SMOOTH; 1017 int ax = dx + hx;
1018 int ay = dy + hy;
1096 1019
1097 ewhatstart = esl.length (); 1020 int mask = (ax << 10) | (ay << 4);
1098 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1021 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1099 could need to be taken away */
1100 eentrysize = getExtendedMapInfoSize (&socket);
1101 esl << "mapextended "
1102 << uint8 (extendedinfos)
1103 << uint8 (eentrysize);
1104 1022
1105 estartlen = esl.length (); 1023 /* If the coordinates are not valid, or it is too dark to see,
1106 } 1024 * we tell the client as such
1107
1108 /* x,y are the real map locations. ax, ay are viewport relative
1109 * locations.
1110 */ 1025 */
1111 ay = 0; 1026 if (!m)
1112
1113 /* We could do this logic as conditionals in the if statement,
1114 * but that started to get a bit messy to look at.
1115 */
1116 max_x = ob->x + (socket.mapx + 1) / 2;
1117 max_y = ob->y + (socket.mapy + 1) / 2;
1118
1119 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1120 { 1027 {
1121 sint16 nx, ny; 1028 /* space is out of map. Update space and clear values
1122 maptile *m = 0; 1029 * if this hasn't already been done. If the space is out
1123 1030 * of the map, it shouldn't have a head.
1124 ax = 0; 1031 */
1125 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) 1032 if (lastcell.count != -1)
1126 { 1033 {
1127 // check to see if we can simply go one right quickly 1034 sl << uint16 (mask);
1035 map_clearcell (&lastcell, -1);
1128 ++nx; 1036 }
1129 if (m && nx >= m->width) 1037
1038 continue;
1039 }
1040
1041 int d = pl->blocked_los_uc (dx, dy);
1042
1043 if (d > 3)
1044 {
1045 /* This block deals with spaces that are not visible for whatever
1046 * reason. Still may need to send the head for this space.
1047 */
1048 if (lastcell.count != -1
1049 || lastcell.faces[0]
1050 || lastcell.faces[1]
1051 || lastcell.faces[2]
1052 || lastcell.stat_hp
1053 || lastcell.flags
1054 || lastcell.player)
1055 sl << uint16 (mask);
1056
1057 /* properly clear a previously sent big face */
1058 map_clearcell (&lastcell, -1);
1059 }
1060 else
1061 {
1062 /* In this block, the space is visible.
1063 */
1064
1065 /* Rather than try to figure out what everything that we might
1066 * need to send is, then form the packet after that,
1067 * we presume that we will in fact form a packet, and update
1068 * the bits by what we do actually send. If we send nothing,
1069 * we just back out sl.length () to the old value, and no harm
1070 * is done.
1071 * I think this is simpler than doing a bunch of checks to see
1072 * what if anything we need to send, setting the bits, then
1073 * doing those checks again to add the real data.
1074 */
1075 oldlen = sl.length ();
1076
1077 sl << uint16 (mask);
1078
1079 unsigned char dummy;
1080 unsigned char *last_ext = &dummy;
1081
1082 /* Darkness changed */
1083 if (lastcell.count != d)
1084 {
1130 m = 0; 1085 mask |= 0x8;
1131 1086
1132 if (!m) 1087 *last_ext |= 0x80;
1088 last_ext = &sl[sl.length ()];
1089 sl << uint8 (d);
1090 }
1091
1092 lastcell.count = d;
1093
1094 mapspace &ms = m->at (nx, ny);
1095 ms.update ();
1096
1097 // extmap handling
1098 uint8 stat_hp = 0;
1099 uint8 stat_width = 0;
1100 uint8 flags = 0;
1101 tag_t player = 0;
1102
1103 // send hp information, if applicable
1104 if (object *op = ms.faces_obj [0])
1105 if (op->is_head () && !op->invisible)
1133 { 1106 {
1134 nx = x; ny = y; m = plmap; 1107 if (op->stats.maxhp > op->stats.hp
1135 1108 && op->stats.maxhp > 0
1136 if (xy_normalise (m, nx, ny)) 1109 && (op->type == PLAYER
1137 m->touch (); 1110 || op->type == DOOR // does not work, have maxhp 0
1138 else 1111 || QUERY_FLAG (op, FLAG_MONSTER)
1112 || QUERY_FLAG (op, FLAG_ALIVE)
1113 || QUERY_FLAG (op, FLAG_GENERATOR)))
1139 m = 0; 1114 {
1115 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1116 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1117 }
1118
1119 if (expect_false (op->has_dialogue ()))
1120 flags |= 1;
1121
1122 if (expect_false (op->type == PLAYER))
1123 player = op == ob ? pl->ob->count
1124 : op == pl->ob ? ob->count
1125 : op->count;
1140 } 1126 }
1141 1127
1142 int emask, mask; 1128 if (expect_false (lastcell.stat_hp != stat_hp))
1143 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1144
1145 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1146
1147 /* If the coordinates are not valid, or it is too dark to see,
1148 * we tell the client as such
1149 */
1150 if (!m)
1151 { 1129 {
1152 /* space is out of map. Update space and clear values 1130 lastcell.stat_hp = stat_hp;
1153 * if this hasn't already been done. If the space is out 1131
1154 * of the map, it shouldn't have a head 1132 mask |= 0x8;
1155 */ 1133 *last_ext |= 0x80;
1156 if (lastcell.count != -1) 1134 last_ext = &sl[sl.length ()];
1135
1136 sl << uint8 (5) << uint8 (stat_hp);
1137
1138 if (stat_width > 1)
1157 { 1139 {
1158 sl << uint16 (mask);
1159 map_clearcell (&lastcell, -1);
1160 }
1161
1162 continue;
1163 }
1164
1165 int d = pl->blocked_los[ax][ay];
1166
1167 if (d > 3)
1168 {
1169
1170 int need_send = 0, count;
1171
1172 /* This block deals with spaces that are not visible for whatever
1173 * reason. Still may need to send the head for this space.
1174 */
1175
1176 oldlen = sl.length ();
1177
1178 sl << uint16 (mask);
1179
1180 if (lastcell.count != -1)
1181 need_send = 1;
1182
1183 count = -1;
1184
1185 /* properly clear a previously sent big face */
1186 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1187 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1188 need_send = 1;
1189
1190 map_clearcell (&lastcell, count);
1191
1192 if ((mask & 0xf) || need_send)
1193 sl[oldlen + 1] = mask & 0xff;
1194 else
1195 sl.reset (oldlen);
1196 }
1197 else
1198 {
1199 /* In this block, the space is visible.
1200 */
1201
1202 /* Rather than try to figure out what everything that we might
1203 * need to send is, then form the packet after that,
1204 * we presume that we will in fact form a packet, and update
1205 * the bits by what we do actually send. If we send nothing,
1206 * we just back out sl.length () to the old value, and no harm
1207 * is done.
1208 * I think this is simpler than doing a bunch of checks to see
1209 * what if anything we need to send, setting the bits, then
1210 * doing those checks again to add the real data.
1211 */
1212 oldlen = sl.length ();
1213 eoldlen = esl.length ();
1214
1215 sl << uint16 (mask);
1216
1217 unsigned char dummy;
1218 unsigned char *last_ext = &dummy;
1219
1220 /* Darkness changed */
1221 if (lastcell.count != d && socket.darkness)
1222 {
1223 mask |= 0x8;
1224
1225 if (socket.extmap)
1226 {
1227 *last_ext |= 0x80; 1140 *last_ext |= 0x80;
1228 last_ext = &sl[sl.length ()]; 1141 last_ext = &sl[sl.length ()];
1229 sl << uint8 (d); 1142
1230 } 1143 sl << uint8 (6) << uint8 (stat_width);
1231 else
1232 sl << uint8 (255 - 64 * d);
1233 } 1144 }
1145 }
1234 1146
1235 lastcell.count = d; 1147 if (expect_false (lastcell.player != player))
1236
1237 mapspace &ms = m->at (nx, ny);
1238 ms.update ();
1239
1240 if (socket.extmap)
1241 { 1148 {
1242 uint8 stat_hp = 0; 1149 lastcell.player = player;
1243 uint8 stat_width = 0;
1244 uint8 flags = 0;
1245 tag_t player = 0;
1246 1150
1247 // send hp information, if applicable
1248 if (object *op = ms.faces_obj [0])
1249 if (op->is_head () && !op->invisible)
1250 {
1251 if (op->stats.maxhp > op->stats.hp
1252 && op->stats.maxhp > 0
1253 && (op->type == PLAYER
1254 || op->type == DOOR // does not work, have maxhp 0
1255 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)))
1256 {
1257 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1258 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1259 }
1260
1261 if (op->msg && op->msg[0] == '@')
1262 flags |= 1;
1263
1264 if (op->type == PLAYER && op != ob)
1265 player = op->count;
1266 }
1267
1268 if (lastcell.stat_hp != stat_hp)
1269 {
1270 lastcell.stat_hp = stat_hp;
1271
1272 mask |= 0x8; 1151 mask |= 0x8;
1273 *last_ext |= 0x80; 1152 *last_ext |= 0x80;
1274 last_ext = &sl[sl.length ()]; 1153 last_ext = &sl[sl.length ()];
1275 1154
1276 sl << uint8 (5) << uint8 (stat_hp);
1277
1278 if (stat_width > 1)
1279 {
1280 *last_ext |= 0x80;
1281 last_ext = &sl[sl.length ()];
1282
1283 sl << uint8 (6) << uint8 (stat_width);
1284 }
1285 }
1286
1287 if (lastcell.player != player)
1288 {
1289 lastcell.player = player;
1290
1291 mask |= 0x8;
1292 *last_ext |= 0x80;
1293 last_ext = &sl[sl.length ()];
1294
1295 sl << uint8 (0x47) << uint8 (4) << (uint32)player; 1155 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1296 } 1156 }
1297 1157
1298 if (lastcell.flags != flags) 1158 if (expect_false (lastcell.flags != flags))
1299 { 1159 {
1300 lastcell.flags = flags; 1160 lastcell.flags = flags;
1301 1161
1302 mask |= 0x8; 1162 mask |= 0x8;
1303 *last_ext |= 0x80; 1163 *last_ext |= 0x80;
1304 last_ext = &sl[sl.length ()]; 1164 last_ext = &sl[sl.length ()];
1305 1165
1306 sl << uint8 (8) << uint8 (flags); 1166 sl << uint8 (8) << uint8 (flags);
1307 }
1308 } 1167 }
1309 1168
1169 // faces
1170
1310 /* Floor face */ 1171 /* Floor face */
1311 if (update_space (sl, socket, ms, lastcell, 2)) 1172 if (update_space (sl, socket, ms, lastcell, 2))
1312 mask |= 0x4; 1173 mask |= 0x4;
1313 1174
1314 /* Middle face */ 1175 /* Middle face */
1315 if (update_space (sl, socket, ms, lastcell, 1)) 1176 if (update_space (sl, socket, ms, lastcell, 1))
1316 mask |= 0x2; 1177 mask |= 0x2;
1317 1178
1179 if (expect_false (ob->invisible)
1180 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1318 if (ms.player () == ob 1181 && ms.player () == ob)
1319 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1320 { 1182 {
1321 // force player to be visible to himself if invisible 1183 // force player to be visible to himself if invisible
1322 if (lastcell.faces[0] != ob->face) 1184 if (lastcell.faces[0] != ob->face)
1323 { 1185 {
1324 lastcell.faces[0] = ob->face; 1186 lastcell.faces[0] = ob->face;
1325 1187
1326 mask |= 0x1;
1327 sl << uint16 (ob->face);
1328
1329 socket.send_faces (ob);
1330 }
1331 }
1332 /* Top face */
1333 else if (update_space (sl, socket, ms, lastcell, 0))
1334 mask |= 0x1; 1188 mask |= 0x1;
1189 sl << uint16 (ob->face);
1335 1190
1191 socket.send_faces (ob);
1192 }
1193 }
1194 /* Top face */
1195 else if (update_space (sl, socket, ms, lastcell, 0))
1196 mask |= 0x1;
1197
1336 /* Check to see if we are in fact sending anything for this 1198 /* Check to see if we are in fact sending anything for this
1337 * space by checking the mask. If so, update the mask. 1199 * space by checking the mask. If so, update the mask.
1338 * if not, reset the len to that from before adding the mask 1200 * if not, reset the len to that from before adding the mask
1339 * value, so we don't send those bits. 1201 * value, so we don't send those bits.
1340 */ 1202 */
1341 if (mask & 0xf) 1203 if (mask & 0xf)
1342 sl[oldlen + 1] = mask & 0xff; 1204 sl[oldlen + 1] = mask & 0xff;
1343 else 1205 else
1344 sl.reset (oldlen); 1206 sl.reset (oldlen);
1345
1346 if (socket.ext_mapinfos)
1347 esl << uint16 (emask);
1348
1349 if (socket.EMI_smooth)
1350 {
1351 for (int layer = 2+1; layer--; )
1352 {
1353 object *ob = ms.faces_obj [layer];
1354
1355 // If there is no object for this space, or if the face for the object
1356 // is the blank face, set the smoothlevel to zero.
1357 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1358
1359 // We've gotten what face we want to use for the object. Now see if
1360 // if it has changed since we last sent it to the client.
1361 if (lastcell.smooth[layer] != smoothlevel)
1362 {
1363 lastcell.smooth[layer] = smoothlevel;
1364 esl << uint8 (smoothlevel);
1365 emask |= 1 << layer;
1366 }
1367 }
1368
1369 if (emask & 0xf)
1370 esl[eoldlen + 1] = emask & 0xff;
1371 else
1372 esl.reset (eoldlen);
1373 }
1374 } /* else this is a viewable space */ 1207 } /* else this is a viewable space */
1375 } /* for x loop */ 1208 ordered_mapwalk_end
1376 } /* for y loop */
1377 1209
1378 socket.flush_fx (); 1210 socket.flush_fx ();
1379
1380 /* Verify that we in fact do need to send this */
1381 if (socket.ext_mapinfos)
1382 {
1383 if (!(sl.length () > startlen || socket.sent_scroll))
1384 {
1385 /* No map data will follow, so don't say the client
1386 * it doesn't need draw!
1387 */
1388 ewhatflag &= ~EMI_NOREDRAW;
1389 esl[ewhatstart + 1] = ewhatflag & 0xff;
1390 }
1391
1392 if (esl.length () > estartlen)
1393 socket.send_packet (esl);
1394 }
1395 1211
1396 if (sl.length () > startlen || socket.sent_scroll) 1212 if (sl.length () > startlen || socket.sent_scroll)
1397 { 1213 {
1398 socket.send_packet (sl); 1214 socket.send_packet (sl);
1399 socket.sent_scroll = 0; 1215 socket.sent_scroll = 0;
… …
1420{ 1236{
1421 packet sl; 1237 packet sl;
1422 sl << "replyinfo skill_info\n"; 1238 sl << "replyinfo skill_info\n";
1423 1239
1424 for (int i = 1; i < NUM_SKILLS; i++) 1240 for (int i = 1; i < NUM_SKILLS; i++)
1425 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1241 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1426 1242
1427 if (sl.length () > MAXSOCKBUF) 1243 if (sl.length () > MAXSOCKBUF)
1428 { 1244 {
1429 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1245 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1430 fatal (0); 1246 fatal (0);
… …
1474 if (spell->type == SPELL) 1290 if (spell->type == SPELL)
1475 { 1291 {
1476 int flags = 0; 1292 int flags = 0;
1477 1293
1478 /* check if we need to update it */ 1294 /* check if we need to update it */
1479 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1295 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1480 { 1296 {
1481 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1297 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1482 flags |= UPD_SP_MANA; 1298 flags |= UPD_SP_MANA;
1483 } 1299 }
1484 1300
1485 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1301 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1486 { 1302 {
1487 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1303 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1488 flags |= UPD_SP_GRACE; 1304 flags |= UPD_SP_GRACE;
1489 } 1305 }
1490 1306
1491 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1307 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1492 { 1308 {
1493 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1309 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1494 flags |= UPD_SP_DAMAGE; 1310 flags |= UPD_SP_DAMAGE;
1495 } 1311 }
1496 1312
1497 if (flags) 1313 if (flags)
1498 { 1314 {
… …
1500 1316
1501 sl << "updspell " 1317 sl << "updspell "
1502 << uint8 (flags) 1318 << uint8 (flags)
1503 << uint32 (spell->count); 1319 << uint32 (spell->count);
1504 1320
1505 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1321 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1506 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1322 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1507 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1323 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1508 1324
1509 pl->ns->send_packet (sl); 1325 pl->ns->send_packet (sl);
1510 } 1326 }
1511 } 1327 }
1512 } 1328 }
… …
1542 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1358 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1543 return; 1359 return;
1544 } 1360 }
1545 1361
1546 /* store costs and damage in the object struct, to compare to later */ 1362 /* store costs and damage in the object struct, to compare to later */
1547 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1363 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1548 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1364 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1549 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1365 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1550 1366
1551 /* figure out which skill it uses, if it uses one */ 1367 /* figure out which skill it uses, if it uses one */
1552 if (spell->skill) 1368 if (spell->skill)
1553 { 1369 if (object *tmp = pl->find_skill (spell->skill))
1554 for (i = 1; i < NUM_SKILLS; i++)
1555 if (!strcmp (spell->skill, skill_names[i]))
1556 {
1557 skill = i + CS_STAT_SKILLINFO; 1370 skill = tmp->subtype + CS_STAT_SKILLINFO;
1558 break;
1559 }
1560 }
1561 1371
1562 // spells better have a face 1372 // spells better have a face
1563 if (!spell->face) 1373 if (!spell->face)
1564 { 1374 {
1565 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1375 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
… …
1570 1380
1571 /* send the current values */ 1381 /* send the current values */
1572 sl << uint32 (spell->count) 1382 sl << uint32 (spell->count)
1573 << uint16 (spell->level) 1383 << uint16 (spell->level)
1574 << uint16 (spell->casting_time) 1384 << uint16 (spell->casting_time)
1575 << uint16 (spell->last_sp) 1385 << uint16 (spell->cached_sp)
1576 << uint16 (spell->last_grace) 1386 << uint16 (spell->cached_grace)
1577 << uint16 (spell->last_eat) 1387 << uint16 (spell->cached_eat)
1578 << uint8 (skill) 1388 << uint8 (skill)
1579 << uint32 (spell->path_attuned) 1389 << uint32 (spell->path_attuned)
1580 << uint32 (spell->face) 1390 << uint32 (spell->face)
1581 << data8 (spell->name) 1391 << data8 (spell->name)
1582 << data16 (spell->msg); 1392 << data16 (spell->msg);

Diff Legend

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