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

Diff Legend

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