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.125 by root, Tue Apr 22 04:33:20 2008 UTC vs.
Revision 1.152 by root, Tue Oct 20 07:18:11 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 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
… …
458 while (1) 425 while (1)
459 { 426 {
460 /* 1. Extract an info */ 427 /* 1. Extract an info */
461 info = nextinfo; 428 info = nextinfo;
462 429
463 while ((info < len) && (buf[info] == ' ')) 430 while ((info < len) && (buf [info] == ' '))
464 info++; 431 info++;
465 432
466 if (info >= len) 433 if (info >= len)
467 break; 434 break;
468 435
469 nextinfo = info + 1; 436 nextinfo = info + 1;
470 437
471 while ((nextinfo < len) && (buf[nextinfo] != ' ')) 438 while ((nextinfo < len) && (buf [nextinfo] != ' '))
472 nextinfo++; 439 nextinfo++;
473 440
474 if (nextinfo - info >= 49) /*Erroneous info asked */ 441 if (nextinfo - info >= 49) /*Erroneous info asked */
475 continue; 442 continue;
476 443
477 strncpy (command, &(buf[info]), nextinfo - info); 444 memcpy (command, buf + info, nextinfo - info);
478 command[nextinfo - info] = '\0'; 445 command [nextinfo - info] = 0;
446
479 /* 2. Interpret info */ 447 /* 2. Interpret info */
480 i = sscanf (command, "%d", &flag); 448 i = sscanf (command, "%d", &flag);
481 449
482 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST)) 450 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
483 ns->supported_readables |= (1 << flag); 451 ns->supported_readables |= (1 << flag);
… …
517 return; 485 return;
518 486
519 buf++; 487 buf++;
520 } 488 }
521 489
522 execute_newserver_command (pl->ob, (char *) buf); 490 execute_newserver_command (pl->ob, (char *)buf);
523 491
524 /* Perhaps something better should be done with a left over count. 492 /* Perhaps something better should be done with a left over count.
525 * Cleaning up the input should probably be done first - all actions 493 * Cleaning up the input should probably be done first - all actions
526 * for the command that issued the count should be done before any other 494 * for the command that issued the count should be done before any other
527 * commands. 495 * commands.
… …
686 * syntax is: move (to) (tag) (nrof) 654 * syntax is: move (to) (tag) (nrof)
687 */ 655 */
688void 656void
689MoveCmd (char *buf, int len, player *pl) 657MoveCmd (char *buf, int len, player *pl)
690{ 658{
691 int vals[3], i; 659 int to, tag, nrof;
692 660
693 /* A little funky here. We only cycle for 2 records, because 661 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 { 662 {
700 vals[i] = atoi (buf);
701
702 if (!(buf = strchr (buf, ' ')))
703 {
704 LOG (llevError, "Incomplete move command: %s\n", buf); 663 LOG (llevError, "Incomplete move command: %s\n", buf);
705 return; 664 return;
706 }
707
708 buf++;
709 } 665 }
710 666
711 vals[2] = atoi (buf); 667 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} 668}
716 669
717/****************************************************************************** 670/******************************************************************************
718 * 671 *
719 * Start of commands the server sends to the client. 672 * Start of commands the server sends to the client.
… …
734 * Get player's current range attack in obuf. 687 * Get player's current range attack in obuf.
735 */ 688 */
736static void 689static void
737rangetostring (player *pl, char *obuf) 690rangetostring (player *pl, char *obuf)
738{ 691{
739 dynbuf_text buf; 692 dynbuf_text &buf = msg_dynbuf; buf.clear ();
740 693
741 if (pl->ranged_ob) 694 if (pl->ranged_ob)
742 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 695 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
743 696
744 if (pl->combat_ob) 697 if (pl->combat_ob)
… …
820 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 773 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
821 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 774 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
822 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 775 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
823 776
824 for (int s = 0; s < NUM_SKILLS; s++) 777 for (int s = 0; s < NUM_SKILLS; s++)
825 if (object *skill = opl->last_skill_ob[s]) 778 if (object *skill = opl->last_skill_ob [s])
826 if (skill->stats.exp != ns->last_skill_exp [s]) 779 if (skill->stats.exp != ns->last_skill_exp [s])
827 { 780 {
828 ns->last_skill_exp [s] = skill->stats.exp; 781 ns->last_skill_exp [s] = skill->stats.exp;
829 782
830 /* Always send along the level if exp changes. This is only 783 /* Always send along the level if exp changes. This is only
… …
886 839
887/** 840/**
888 * Tells the client that here is a player it should start using. 841 * Tells the client that here is a player it should start using.
889 */ 842 */
890void 843void
891esrv_new_player (player *pl, uint32 weight) 844esrv_new_player (player *pl)
892{ 845{
846 sint32 weight = pl->ob->client_weight ();
847
893 packet sl ("player"); 848 packet sl ("player");
894 849
895 sl << uint32 (pl->ob->count) 850 sl << uint32 (pl->ob->count)
896 << uint32 (weight) 851 << uint32 (weight)
897 << uint32 (pl->ob->face) 852 << uint32 (pl->ob->face)
898 << data8 (pl->ob->name); 853 << data8 (pl->ob->name);
899 854
900 pl->ns->last_weight = weight; 855 pl->ns->last_weight = weight;
901 pl->ns->send_packet (sl); 856 pl->ns->send_packet (sl);
902 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
903} 857}
904 858
905/****************************************************************************** 859/******************************************************************************
906 * 860 *
907 * Start of map related commands. 861 * Start of map related commands.
… …
974 928
975 /* Nothing changed */ 929 /* Nothing changed */
976 return 0; 930 return 0;
977} 931}
978 932
979/**
980 * Returns the size of a data for a map square as returned by
981 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
982 * available.
983 */
984int
985getExtendedMapInfoSize (client * ns)
986{
987 int result = 0;
988
989 if (ns->ext_mapinfos)
990 {
991 if (ns->EMI_smooth)
992 result += 1; /*One byte for smoothlevel */
993 }
994
995 return result;
996}
997
998// prefetch (and touch) all maps within a specific distancd 933// prefetch (and touch) all maps within a specific distancd
999static void 934static void
1000prefetch_surrounding_maps (maptile *map, int distance) 935prefetch_surrounding_maps (maptile *map, int distance)
1001{ 936{
1002 map->last_access = runtime; 937 map->touch ();
1003 938
1004 if (--distance) 939 if (--distance)
1005 for (int dir = 4; --dir; ) 940 for (int dir = 4; --dir; )
1006 if (const shstr &path = map->tile_path [dir]) 941 if (const shstr &path = map->tile_path [dir])
1007 if (maptile *&neigh = map->tile_map [dir]) 942 if (maptile *&neigh = map->tile_map [dir])
… …
1025{ 960{
1026 object *ob = pl->observe; 961 object *ob = pl->observe;
1027 if (!ob->active) 962 if (!ob->active)
1028 return; 963 return;
1029 964
1030 maptile *plmap = ob->map;
1031
1032 /* If player is just joining the game, he isn't here yet, so the map 965 /* If player is just joining the game, he isn't here yet, so the map
1033 * can get swapped out. If so, don't try to send them a map. All will 966 * can get swapped out. If so, don't try to send them a map. All will
1034 * be OK once they really log in. 967 * be OK once they really log in.
1035 */ 968 */
1036 if (!plmap || plmap->in_memory != MAP_ACTIVE) 969 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1037 return; 970 return;
1038 971
1039 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1040 int estartlen, eoldlen; 972 int startlen, oldlen;
1041 uint8 eentrysize;
1042 uint16 ewhatstart, ewhatflag;
1043 uint8 extendedinfos;
1044 973
1045 check_map_change (pl); 974 check_map_change (pl);
1046 prefetch_surrounding_maps (pl->ob); 975 prefetch_surrounding_maps (pl->ob);
1047 976
1048 /* do LOS after calls to update_position */ 977 /* do LOS after calls to update_position */
1049 if (ob != pl->ob) 978 /* unfortunately, we need to udpate los when observing, currently */
1050 clear_los (pl); 979 if (pl->do_los || pl->observe != pl->ob)
1051 else if (pl->do_los)
1052 { 980 {
1053 update_los (ob);
1054 pl->do_los = 0; 981 pl->do_los = 0;
982 pl->update_los ();
1055 } 983 }
1056 984
1057 /** 985 /**
1058 * This function uses the new map1 protocol command to send the map 986 * This function uses the new map1 protocol command to send the map
1059 * to the client. It is necessary because the old map command supports 987 * to the client. It is necessary because the old map command supports
… …
1078 */ 1006 */
1079 1007
1080 client &socket = *pl->ns; 1008 client &socket = *pl->ns;
1081 1009
1082 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1010 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1083 packet esl;
1084 1011
1085 startlen = sl.length (); 1012 startlen = sl.length ();
1086 1013
1087 /*Extendedmapinfo structure initialisation */ 1014 int hx = socket.mapx / 2;
1088 if (socket.ext_mapinfos) 1015 int hy = socket.mapy / 2;
1089 {
1090 extendedinfos = EMI_NOREDRAW;
1091 1016
1092 if (socket.EMI_smooth) 1017 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1093 extendedinfos |= EMI_SMOOTH; 1018 int ax = dx + hx;
1019 int ay = dy + hy;
1094 1020
1095 ewhatstart = esl.length (); 1021 int mask = (ax << 10) | (ay << 4);
1096 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1022 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1097 could need to be taken away */
1098 eentrysize = getExtendedMapInfoSize (&socket);
1099 esl << "mapextended "
1100 << uint8 (extendedinfos)
1101 << uint8 (eentrysize);
1102 1023
1103 estartlen = esl.length (); 1024 /* If the coordinates are not valid, or it is too dark to see,
1104 } 1025 * we tell the client as such
1105
1106 /* x,y are the real map locations. ax, ay are viewport relative
1107 * locations.
1108 */ 1026 */
1109 ay = 0; 1027 if (!m)
1110
1111 /* We could do this logic as conditionals in the if statement,
1112 * but that started to get a bit messy to look at.
1113 */
1114 max_x = ob->x + (socket.mapx + 1) / 2;
1115 max_y = ob->y + (socket.mapy + 1) / 2;
1116
1117 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1118 { 1028 {
1119 sint16 nx, ny; 1029 /* space is out of map. Update space and clear values
1120 maptile *m = 0; 1030 * if this hasn't already been done. If the space is out
1121 1031 * of the map, it shouldn't have a head.
1122 ax = 0; 1032 */
1123 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) 1033 if (lastcell.count != -1)
1124 { 1034 {
1125 // check to see if we can simply go one right quickly 1035 sl << uint16 (mask);
1036 map_clearcell (&lastcell, -1);
1126 ++nx; 1037 }
1127 if (m && nx >= m->width) 1038
1039 continue;
1040 }
1041
1042 int d = pl->blocked_los_uc (dx, dy);
1043
1044 if (d > 3)
1045 {
1046 /* This block deals with spaces that are not visible for whatever
1047 * reason. Still may need to send the head for this space.
1048 */
1049 if (lastcell.count != -1
1050 || lastcell.faces[0]
1051 || lastcell.faces[1]
1052 || lastcell.faces[2]
1053 || lastcell.stat_hp
1054 || lastcell.flags
1055 || lastcell.player)
1056 sl << uint16 (mask);
1057
1058 /* properly clear a previously sent big face */
1059 map_clearcell (&lastcell, -1);
1060 }
1061 else
1062 {
1063 /* In this block, the space is visible.
1064 */
1065
1066 /* Rather than try to figure out what everything that we might
1067 * need to send is, then form the packet after that,
1068 * we presume that we will in fact form a packet, and update
1069 * the bits by what we do actually send. If we send nothing,
1070 * we just back out sl.length () to the old value, and no harm
1071 * is done.
1072 * I think this is simpler than doing a bunch of checks to see
1073 * what if anything we need to send, setting the bits, then
1074 * doing those checks again to add the real data.
1075 */
1076 oldlen = sl.length ();
1077
1078 sl << uint16 (mask);
1079
1080 unsigned char dummy;
1081 unsigned char *last_ext = &dummy;
1082
1083 /* Darkness changed */
1084 if (lastcell.count != d)
1085 {
1128 m = 0; 1086 mask |= 0x8;
1129 1087
1130 if (!m) 1088 *last_ext |= 0x80;
1089 last_ext = &sl[sl.length ()];
1090 sl << uint8 (d);
1091 }
1092
1093 lastcell.count = d;
1094
1095 mapspace &ms = m->at (nx, ny);
1096 ms.update ();
1097
1098 // extmap handling
1099 uint8 stat_hp = 0;
1100 uint8 stat_width = 0;
1101 uint8 flags = 0;
1102 tag_t player = 0;
1103
1104 // send hp information, if applicable
1105 if (object *op = ms.faces_obj [0])
1106 if (op->is_head () && !op->invisible)
1131 { 1107 {
1132 nx = x; ny = y; m = plmap; 1108 if (op->stats.maxhp > op->stats.hp
1133 1109 && op->stats.maxhp > 0
1134 if (xy_normalise (m, nx, ny)) 1110 && (op->type == PLAYER
1135 m->touch (); 1111 || op->type == DOOR // does not work, have maxhp 0
1136 else 1112 || QUERY_FLAG (op, FLAG_MONSTER)
1113 || QUERY_FLAG (op, FLAG_ALIVE)
1114 || QUERY_FLAG (op, FLAG_GENERATOR)))
1137 m = 0; 1115 {
1116 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1117 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1118 }
1119
1120 if (expect_false (op->has_dialogue ()))
1121 flags |= 1;
1122
1123 if (expect_false (op->type == PLAYER))
1124 player = op == ob ? pl->ob->count
1125 : op == pl->ob ? ob->count
1126 : op->count;
1138 } 1127 }
1139 1128
1140 int emask, mask; 1129 if (expect_false (lastcell.stat_hp != stat_hp))
1141 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1142
1143 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1144
1145 /* If the coordinates are not valid, or it is too dark to see,
1146 * we tell the client as such
1147 */
1148 if (!m)
1149 { 1130 {
1150 /* space is out of map. Update space and clear values 1131 lastcell.stat_hp = stat_hp;
1151 * if this hasn't already been done. If the space is out 1132
1152 * of the map, it shouldn't have a head 1133 mask |= 0x8;
1153 */ 1134 *last_ext |= 0x80;
1154 if (lastcell.count != -1) 1135 last_ext = &sl[sl.length ()];
1136
1137 sl << uint8 (5) << uint8 (stat_hp);
1138
1139 if (stat_width > 1)
1155 { 1140 {
1156 sl << uint16 (mask);
1157 map_clearcell (&lastcell, -1);
1158 }
1159
1160 continue;
1161 }
1162
1163 int d = pl->blocked_los[ax][ay];
1164
1165 if (d > 3)
1166 {
1167
1168 int need_send = 0, count;
1169
1170 /* This block deals with spaces that are not visible for whatever
1171 * reason. Still may need to send the head for this space.
1172 */
1173
1174 oldlen = sl.length ();
1175
1176 sl << uint16 (mask);
1177
1178 if (lastcell.count != -1)
1179 need_send = 1;
1180
1181 count = -1;
1182
1183 /* properly clear a previously sent big face */
1184 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1185 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1186 need_send = 1;
1187
1188 map_clearcell (&lastcell, count);
1189
1190 if ((mask & 0xf) || need_send)
1191 sl[oldlen + 1] = mask & 0xff;
1192 else
1193 sl.reset (oldlen);
1194 }
1195 else
1196 {
1197 /* In this block, the space is visible.
1198 */
1199
1200 /* Rather than try to figure out what everything that we might
1201 * need to send is, then form the packet after that,
1202 * we presume that we will in fact form a packet, and update
1203 * the bits by what we do actually send. If we send nothing,
1204 * we just back out sl.length () to the old value, and no harm
1205 * is done.
1206 * I think this is simpler than doing a bunch of checks to see
1207 * what if anything we need to send, setting the bits, then
1208 * doing those checks again to add the real data.
1209 */
1210 oldlen = sl.length ();
1211 eoldlen = esl.length ();
1212
1213 sl << uint16 (mask);
1214
1215 unsigned char dummy;
1216 unsigned char *last_ext = &dummy;
1217
1218 /* Darkness changed */
1219 if (lastcell.count != d && socket.darkness)
1220 {
1221 mask |= 0x8;
1222
1223 if (socket.extmap)
1224 {
1225 *last_ext |= 0x80; 1141 *last_ext |= 0x80;
1226 last_ext = &sl[sl.length ()]; 1142 last_ext = &sl[sl.length ()];
1227 sl << uint8 (d); 1143
1228 } 1144 sl << uint8 (6) << uint8 (stat_width);
1229 else
1230 sl << uint8 (255 - 64 * d);
1231 } 1145 }
1146 }
1232 1147
1233 lastcell.count = d; 1148 if (expect_false (lastcell.player != player))
1234
1235 mapspace &ms = m->at (nx, ny);
1236 ms.update ();
1237
1238 if (socket.extmap)
1239 { 1149 {
1240 uint8 stat_hp = 0; 1150 lastcell.player = player;
1241 uint8 stat_width = 0;
1242 uint8 flags = 0;
1243 tag_t player = 0;
1244 1151
1245 // send hp information, if applicable
1246 if (object *op = ms.faces_obj [0])
1247 if (op->is_head () && !op->invisible)
1248 {
1249 if (op->stats.maxhp > op->stats.hp
1250 && op->stats.maxhp > 0
1251 && (op->type == PLAYER
1252 || op->type == DOOR // does not work, have maxhp 0
1253 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)))
1254 {
1255 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1256 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1257 }
1258
1259 if (op->msg && op->msg[0] == '@')
1260 flags |= 1;
1261
1262 if (op->type == PLAYER && op != ob)
1263 player = op->count;
1264 }
1265
1266 if (lastcell.stat_hp != stat_hp)
1267 {
1268 lastcell.stat_hp = stat_hp;
1269
1270 mask |= 0x8; 1152 mask |= 0x8;
1271 *last_ext |= 0x80; 1153 *last_ext |= 0x80;
1272 last_ext = &sl[sl.length ()]; 1154 last_ext = &sl[sl.length ()];
1273 1155
1274 sl << uint8 (5) << uint8 (stat_hp);
1275
1276 if (stat_width > 1)
1277 {
1278 *last_ext |= 0x80;
1279 last_ext = &sl[sl.length ()];
1280
1281 sl << uint8 (6) << uint8 (stat_width);
1282 }
1283 }
1284
1285 if (lastcell.player != player)
1286 {
1287 lastcell.player = player;
1288
1289 mask |= 0x8;
1290 *last_ext |= 0x80;
1291 last_ext = &sl[sl.length ()];
1292
1293 sl << uint8 (0x47) << uint8 (4) << (uint32)player; 1156 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1294 } 1157 }
1295 1158
1296 if (lastcell.flags != flags) 1159 if (expect_false (lastcell.flags != flags))
1297 { 1160 {
1298 lastcell.flags = flags; 1161 lastcell.flags = flags;
1299 1162
1300 mask |= 0x8; 1163 mask |= 0x8;
1301 *last_ext |= 0x80; 1164 *last_ext |= 0x80;
1302 last_ext = &sl[sl.length ()]; 1165 last_ext = &sl[sl.length ()];
1303 1166
1304 sl << uint8 (8) << uint8 (flags); 1167 sl << uint8 (8) << uint8 (flags);
1305 }
1306 } 1168 }
1307 1169
1170 // faces
1171
1308 /* Floor face */ 1172 /* Floor face */
1309 if (update_space (sl, socket, ms, lastcell, 2)) 1173 if (update_space (sl, socket, ms, lastcell, 2))
1310 mask |= 0x4; 1174 mask |= 0x4;
1311 1175
1312 /* Middle face */ 1176 /* Middle face */
1313 if (update_space (sl, socket, ms, lastcell, 1)) 1177 if (update_space (sl, socket, ms, lastcell, 1))
1314 mask |= 0x2; 1178 mask |= 0x2;
1315 1179
1180 if (expect_false (ob->invisible)
1181 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1316 if (ms.player () == ob 1182 && ms.player () == ob)
1317 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1318 { 1183 {
1319 // force player to be visible to himself if invisible 1184 // force player to be visible to himself if invisible
1320 if (lastcell.faces[0] != ob->face) 1185 if (lastcell.faces[0] != ob->face)
1321 { 1186 {
1322 lastcell.faces[0] = ob->face; 1187 lastcell.faces[0] = ob->face;
1323 1188
1324 mask |= 0x1;
1325 sl << uint16 (ob->face);
1326
1327 socket.send_faces (ob);
1328 }
1329 }
1330 /* Top face */
1331 else if (update_space (sl, socket, ms, lastcell, 0))
1332 mask |= 0x1; 1189 mask |= 0x1;
1190 sl << uint16 (ob->face);
1333 1191
1192 socket.send_faces (ob);
1193 }
1194 }
1195 /* Top face */
1196 else if (update_space (sl, socket, ms, lastcell, 0))
1197 mask |= 0x1;
1198
1334 /* Check to see if we are in fact sending anything for this 1199 /* Check to see if we are in fact sending anything for this
1335 * space by checking the mask. If so, update the mask. 1200 * space by checking the mask. If so, update the mask.
1336 * if not, reset the len to that from before adding the mask 1201 * if not, reset the len to that from before adding the mask
1337 * value, so we don't send those bits. 1202 * value, so we don't send those bits.
1338 */ 1203 */
1339 if (mask & 0xf) 1204 if (mask & 0xf)
1340 sl[oldlen + 1] = mask & 0xff; 1205 sl[oldlen + 1] = mask & 0xff;
1341 else 1206 else
1342 sl.reset (oldlen); 1207 sl.reset (oldlen);
1343
1344 if (socket.ext_mapinfos)
1345 esl << uint16 (emask);
1346
1347 if (socket.EMI_smooth)
1348 {
1349 for (int layer = 2+1; layer--; )
1350 {
1351 object *ob = ms.faces_obj [layer];
1352
1353 // If there is no object for this space, or if the face for the object
1354 // is the blank face, set the smoothlevel to zero.
1355 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1356
1357 // We've gotten what face we want to use for the object. Now see if
1358 // if it has changed since we last sent it to the client.
1359 if (lastcell.smooth[layer] != smoothlevel)
1360 {
1361 lastcell.smooth[layer] = smoothlevel;
1362 esl << uint8 (smoothlevel);
1363 emask |= 1 << layer;
1364 }
1365 }
1366
1367 if (emask & 0xf)
1368 esl[eoldlen + 1] = emask & 0xff;
1369 else
1370 esl.reset (eoldlen);
1371 }
1372 } /* else this is a viewable space */ 1208 } /* else this is a viewable space */
1373 } /* for x loop */ 1209 ordered_mapwalk_end
1374 } /* for y loop */
1375 1210
1376 socket.flush_fx (); 1211 socket.flush_fx ();
1377
1378 /* Verify that we in fact do need to send this */
1379 if (socket.ext_mapinfos)
1380 {
1381 if (!(sl.length () > startlen || socket.sent_scroll))
1382 {
1383 /* No map data will follow, so don't say the client
1384 * it doesn't need draw!
1385 */
1386 ewhatflag &= ~EMI_NOREDRAW;
1387 esl[ewhatstart + 1] = ewhatflag & 0xff;
1388 }
1389
1390 if (esl.length () > estartlen)
1391 socket.send_packet (esl);
1392 }
1393 1212
1394 if (sl.length () > startlen || socket.sent_scroll) 1213 if (sl.length () > startlen || socket.sent_scroll)
1395 { 1214 {
1396 socket.send_packet (sl); 1215 socket.send_packet (sl);
1397 socket.sent_scroll = 0; 1216 socket.sent_scroll = 0;
… …
1418{ 1237{
1419 packet sl; 1238 packet sl;
1420 sl << "replyinfo skill_info\n"; 1239 sl << "replyinfo skill_info\n";
1421 1240
1422 for (int i = 1; i < NUM_SKILLS; i++) 1241 for (int i = 1; i < NUM_SKILLS; i++)
1423 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1242 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1424 1243
1425 if (sl.length () > MAXSOCKBUF) 1244 if (sl.length () > MAXSOCKBUF)
1426 { 1245 {
1427 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1246 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1428 fatal (0); 1247 fatal (0);
… …
1472 if (spell->type == SPELL) 1291 if (spell->type == SPELL)
1473 { 1292 {
1474 int flags = 0; 1293 int flags = 0;
1475 1294
1476 /* check if we need to update it */ 1295 /* check if we need to update it */
1477 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1296 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1478 { 1297 {
1479 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1298 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1480 flags |= UPD_SP_MANA; 1299 flags |= UPD_SP_MANA;
1481 } 1300 }
1482 1301
1483 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1302 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1484 { 1303 {
1485 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1304 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1486 flags |= UPD_SP_GRACE; 1305 flags |= UPD_SP_GRACE;
1487 } 1306 }
1488 1307
1489 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1308 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1490 { 1309 {
1491 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1310 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1492 flags |= UPD_SP_DAMAGE; 1311 flags |= UPD_SP_DAMAGE;
1493 } 1312 }
1494 1313
1495 if (flags) 1314 if (flags)
1496 { 1315 {
… …
1498 1317
1499 sl << "updspell " 1318 sl << "updspell "
1500 << uint8 (flags) 1319 << uint8 (flags)
1501 << uint32 (spell->count); 1320 << uint32 (spell->count);
1502 1321
1503 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1322 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1504 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1323 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1505 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1324 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1506 1325
1507 pl->ns->send_packet (sl); 1326 pl->ns->send_packet (sl);
1508 } 1327 }
1509 } 1328 }
1510 } 1329 }
… …
1540 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1359 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1541 return; 1360 return;
1542 } 1361 }
1543 1362
1544 /* store costs and damage in the object struct, to compare to later */ 1363 /* store costs and damage in the object struct, to compare to later */
1545 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1364 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1546 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1365 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1547 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1366 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1548 1367
1549 /* figure out which skill it uses, if it uses one */ 1368 /* figure out which skill it uses, if it uses one */
1550 if (spell->skill) 1369 if (spell->skill)
1551 { 1370 if (object *tmp = pl->find_skill (spell->skill))
1552 for (i = 1; i < NUM_SKILLS; i++)
1553 if (!strcmp (spell->skill, skill_names[i]))
1554 {
1555 skill = i + CS_STAT_SKILLINFO; 1371 skill = tmp->subtype + CS_STAT_SKILLINFO;
1556 break;
1557 }
1558 }
1559 1372
1560 // spells better have a face 1373 // spells better have a face
1561 if (!spell->face) 1374 if (!spell->face)
1562 { 1375 {
1563 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1376 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
… …
1568 1381
1569 /* send the current values */ 1382 /* send the current values */
1570 sl << uint32 (spell->count) 1383 sl << uint32 (spell->count)
1571 << uint16 (spell->level) 1384 << uint16 (spell->level)
1572 << uint16 (spell->casting_time) 1385 << uint16 (spell->casting_time)
1573 << uint16 (spell->last_sp) 1386 << uint16 (spell->cached_sp)
1574 << uint16 (spell->last_grace) 1387 << uint16 (spell->cached_grace)
1575 << uint16 (spell->last_eat) 1388 << uint16 (spell->cached_eat)
1576 << uint8 (skill) 1389 << uint8 (skill)
1577 << uint32 (spell->path_attuned) 1390 << uint32 (spell->path_attuned)
1578 << uint32 (spell->face) 1391 << uint32 (spell->face)
1579 << data8 (spell->name) 1392 << data8 (spell->name)
1580 << data16 (spell->msg); 1393 << data16 (spell->msg);

Diff Legend

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