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.145 by root, Fri Dec 26 10:44:17 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;
188 } 219 }
189 } 220 }
190 221
191 socket.current_x = ob->x; 222 socket.current_x = ob->x;
192 socket.current_y = ob->y; 223 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} 224}
201 225
202/** 226/**
203 * RequestInfo is sort of a meta command. There is some specific 227 * RequestInfo is sort of a meta command. There is some specific
204 * request of information, but we call other functions to provide 228 * request of information, but we call other functions to provide
380AddMeCmd (char *buf, int len, client *ns) 404AddMeCmd (char *buf, int len, client *ns)
381{ 405{
382 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 406 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
383} 407}
384 408
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/* 409/*
439#define MSG_TYPE_BOOK 1 410#define MSG_TYPE_BOOK 1
440#define MSG_TYPE_CARD 2 411#define MSG_TYPE_CARD 2
441#define MSG_TYPE_PAPER 3 412#define MSG_TYPE_PAPER 3
442#define MSG_TYPE_SIGN 4 413#define MSG_TYPE_SIGN 4
686 * syntax is: move (to) (tag) (nrof) 657 * syntax is: move (to) (tag) (nrof)
687 */ 658 */
688void 659void
689MoveCmd (char *buf, int len, player *pl) 660MoveCmd (char *buf, int len, player *pl)
690{ 661{
691 int vals[3], i; 662 int to, tag, nrof;
692 663
693 /* A little funky here. We only cycle for 2 records, because 664 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 { 665 {
700 vals[i] = atoi (buf);
701
702 if (!(buf = strchr (buf, ' ')))
703 {
704 LOG (llevError, "Incomplete move command: %s\n", buf); 666 LOG (llevError, "Incomplete move command: %s\n", buf);
705 return; 667 return;
706 }
707
708 buf++;
709 } 668 }
710 669
711 vals[2] = atoi (buf); 670 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} 671}
716 672
717/****************************************************************************** 673/******************************************************************************
718 * 674 *
719 * Start of commands the server sends to the client. 675 * Start of commands the server sends to the client.
820 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 776 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
821 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 777 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
822 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 778 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
823 779
824 for (int s = 0; s < NUM_SKILLS; s++) 780 for (int s = 0; s < NUM_SKILLS; s++)
825 if (object *skill = opl->last_skill_ob[s]) 781 if (object *skill = opl->last_skill_ob [s])
826 if (skill->stats.exp != ns->last_skill_exp [s]) 782 if (skill->stats.exp != ns->last_skill_exp [s])
827 { 783 {
828 ns->last_skill_exp [s] = skill->stats.exp; 784 ns->last_skill_exp [s] = skill->stats.exp;
829 785
830 /* Always send along the level if exp changes. This is only 786 /* Always send along the level if exp changes. This is only
897 sl << uint32 (pl->ob->count) 853 sl << uint32 (pl->ob->count)
898 << uint32 (weight) 854 << uint32 (weight)
899 << uint32 (pl->ob->face) 855 << uint32 (pl->ob->face)
900 << data8 (pl->ob->name); 856 << data8 (pl->ob->name);
901 857
902#if 0
903 pl->ns->last_weight = weight; 858 pl->ns->last_weight = weight;
904#endif
905 pl->ns->send_packet (sl); 859 pl->ns->send_packet (sl);
906 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
907} 860}
908 861
909/****************************************************************************** 862/******************************************************************************
910 * 863 *
911 * Start of map related commands. 864 * Start of map related commands.
978 931
979 /* Nothing changed */ 932 /* Nothing changed */
980 return 0; 933 return 0;
981} 934}
982 935
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 936// prefetch (and touch) all maps within a specific distancd
1003static void 937static void
1004prefetch_surrounding_maps (maptile *map, int distance) 938prefetch_surrounding_maps (maptile *map, int distance)
1005{ 939{
1006 map->last_access = runtime; 940 map->last_access = runtime;
1029{ 963{
1030 object *ob = pl->observe; 964 object *ob = pl->observe;
1031 if (!ob->active) 965 if (!ob->active)
1032 return; 966 return;
1033 967
1034 maptile *plmap = ob->map;
1035
1036 /* If player is just joining the game, he isn't here yet, so the map 968 /* 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 969 * can get swapped out. If so, don't try to send them a map. All will
1038 * be OK once they really log in. 970 * be OK once they really log in.
1039 */ 971 */
1040 if (!plmap || plmap->in_memory != MAP_ACTIVE) 972 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1041 return; 973 return;
1042 974
1043 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1044 int estartlen, eoldlen; 975 int startlen, oldlen;
1045 uint8 eentrysize;
1046 uint16 ewhatstart, ewhatflag;
1047 uint8 extendedinfos;
1048 976
1049 check_map_change (pl); 977 check_map_change (pl);
1050 prefetch_surrounding_maps (pl->ob); 978 prefetch_surrounding_maps (pl->ob);
1051 979
1052 /* do LOS after calls to update_position */ 980 /* do LOS after calls to update_position */
1053 if (ob != pl->ob) 981 /* unfortunately, we need to udpate los when observing, currently */
1054 clear_los (pl); 982 if (pl->do_los || pl->observe != pl->ob)
1055 else if (pl->do_los)
1056 { 983 {
1057 update_los (ob);
1058 pl->do_los = 0; 984 pl->do_los = 0;
985 pl->update_los ();
1059 } 986 }
1060 987
1061 /** 988 /**
1062 * This function uses the new map1 protocol command to send the map 989 * 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 990 * to the client. It is necessary because the old map command supports
1082 */ 1009 */
1083 1010
1084 client &socket = *pl->ns; 1011 client &socket = *pl->ns;
1085 1012
1086 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1013 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1087 packet esl;
1088 1014
1089 startlen = sl.length (); 1015 startlen = sl.length ();
1090 1016
1091 /*Extendedmapinfo structure initialisation */ 1017 int hx = socket.mapx / 2;
1092 if (socket.ext_mapinfos) 1018 int hy = socket.mapy / 2;
1093 {
1094 extendedinfos = EMI_NOREDRAW;
1095 1019
1096 if (socket.EMI_smooth) 1020 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1097 extendedinfos |= EMI_SMOOTH; 1021 int ax = dx + hx;
1022 int ay = dy + hy;
1098 1023
1099 ewhatstart = esl.length (); 1024 int mask = (ax << 10) | (ay << 4);
1100 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1101 could need to be taken away */
1102 eentrysize = getExtendedMapInfoSize (&socket);
1103 esl << "mapextended "
1104 << uint8 (extendedinfos)
1105 << uint8 (eentrysize);
1106
1107 estartlen = esl.length ();
1108 }
1109
1110 /* x,y are the real map locations. ax, ay are viewport relative
1111 * locations.
1112 */
1113 ay = 0;
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 {
1123 sint16 nx, ny;
1124 maptile *m = 0;
1125
1126 ax = 0;
1127 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1128 {
1129 // check to see if we can simply go one right quickly
1130 ++nx;
1131 if (m && nx >= m->width)
1132 m = 0;
1133
1134 if (!m)
1135 {
1136 nx = x; ny = y; m = plmap;
1137
1138 if (xy_normalise (m, nx, ny))
1139 m->touch ();
1140 else
1141 m = 0;
1142 }
1143
1144 int emask, mask;
1145 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1146
1147 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1025 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1148 1026
1149 /* If the coordinates are not valid, or it is too dark to see, 1027 /* If the coordinates are not valid, or it is too dark to see,
1150 * we tell the client as such 1028 * we tell the client as such
1151 */ 1029 */
1152 if (!m) 1030 if (!m)
1153 { 1031 {
1154 /* space is out of map. Update space and clear values 1032 /* space is out of map. Update space and clear values
1155 * if this hasn't already been done. If the space is out 1033 * if this hasn't already been done. If the space is out
1156 * of the map, it shouldn't have a head 1034 * of the map, it shouldn't have a head.
1157 */ 1035 */
1158 if (lastcell.count != -1) 1036 if (lastcell.count != -1)
1037 {
1038 sl << uint16 (mask);
1039 map_clearcell (&lastcell, -1);
1040 }
1041
1042 continue;
1043 }
1044
1045 int d = pl->blocked_los_uc (dx, dy);
1046
1047 if (d > 3)
1048 {
1049 /* This block deals with spaces that are not visible for whatever
1050 * reason. Still may need to send the head for this space.
1051 */
1052 if (lastcell.count != -1
1053 || lastcell.faces[0]
1054 || lastcell.faces[1]
1055 || lastcell.faces[2]
1056 || lastcell.stat_hp
1057 || lastcell.flags
1058 || lastcell.player)
1059 sl << uint16 (mask);
1060
1061 /* properly clear a previously sent big face */
1062 map_clearcell (&lastcell, -1);
1063 }
1064 else
1065 {
1066 /* In this block, the space is visible.
1067 */
1068
1069 /* Rather than try to figure out what everything that we might
1070 * need to send is, then form the packet after that,
1071 * we presume that we will in fact form a packet, and update
1072 * the bits by what we do actually send. If we send nothing,
1073 * we just back out sl.length () to the old value, and no harm
1074 * is done.
1075 * I think this is simpler than doing a bunch of checks to see
1076 * what if anything we need to send, setting the bits, then
1077 * doing those checks again to add the real data.
1078 */
1079 oldlen = sl.length ();
1080
1081 sl << uint16 (mask);
1082
1083 unsigned char dummy;
1084 unsigned char *last_ext = &dummy;
1085
1086 /* Darkness changed */
1087 if (lastcell.count != d && socket.darkness)
1088 {
1089 mask |= 0x8;
1090
1091 if (socket.extmap)
1092 {
1093 *last_ext |= 0x80;
1094 last_ext = &sl[sl.length ()];
1095 sl << uint8 (d);
1096 }
1097 else
1098 sl << uint8 (255 - 64 * d);
1099 }
1100
1101 lastcell.count = d;
1102
1103 mapspace &ms = m->at (nx, ny);
1104 ms.update ();
1105
1106 if (expect_true (socket.extmap))
1107 {
1108 uint8 stat_hp = 0;
1109 uint8 stat_width = 0;
1110 uint8 flags = 0;
1111 tag_t player = 0;
1112
1113 // send hp information, if applicable
1114 if (object *op = ms.faces_obj [0])
1115 if (op->is_head () && !op->invisible)
1159 { 1116 {
1160 sl << uint16 (mask); 1117 if (op->stats.maxhp > op->stats.hp
1161 map_clearcell (&lastcell, -1); 1118 && op->stats.maxhp > 0
1119 && (op->type == PLAYER
1120 || op->type == DOOR // does not work, have maxhp 0
1121 || QUERY_FLAG (op, FLAG_MONSTER)
1122 || QUERY_FLAG (op, FLAG_ALIVE)
1123 || QUERY_FLAG (op, FLAG_GENERATOR)))
1124 {
1125 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1126 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1127 }
1128
1129 if (expect_false (op->has_dialogue ()))
1130 flags |= 1;
1131
1132 if (expect_false (op->type == PLAYER))
1133 player = op == ob ? pl->ob->count
1134 : op == pl->ob ? ob->count
1135 : op->count;
1162 } 1136 }
1163 1137
1164 continue; 1138 if (expect_false (lastcell.stat_hp != stat_hp))
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 { 1139 {
1140 lastcell.stat_hp = stat_hp;
1141
1225 mask |= 0x8; 1142 mask |= 0x8;
1143 *last_ext |= 0x80;
1144 last_ext = &sl[sl.length ()];
1226 1145
1227 if (socket.extmap) 1146 sl << uint8 (5) << uint8 (stat_hp);
1147
1148 if (stat_width > 1)
1228 { 1149 {
1229 *last_ext |= 0x80; 1150 *last_ext |= 0x80;
1230 last_ext = &sl[sl.length ()]; 1151 last_ext = &sl[sl.length ()];
1231 sl << uint8 (d);
1232 }
1233 else
1234 sl << uint8 (255 - 64 * d);
1235 }
1236 1152
1237 lastcell.count = d;
1238
1239 mapspace &ms = m->at (nx, ny);
1240 ms.update ();
1241
1242 if (socket.extmap)
1243 {
1244 uint8 stat_hp = 0;
1245 uint8 stat_width = 0;
1246 uint8 flags = 0;
1247 tag_t player = 0;
1248
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;
1275 *last_ext |= 0x80;
1276 last_ext = &sl[sl.length ()];
1277
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); 1153 sl << uint8 (6) << uint8 (stat_width);
1286 }
1287 } 1154 }
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;
1298 }
1299
1300 if (lastcell.flags != flags)
1301 {
1302 lastcell.flags = flags;
1303
1304 mask |= 0x8;
1305 *last_ext |= 0x80;
1306 last_ext = &sl[sl.length ()];
1307
1308 sl << uint8 (8) << uint8 (flags);
1309 }
1310 } 1155 }
1311 1156
1312 /* Floor face */ 1157 if (expect_false (lastcell.player != player))
1313 if (update_space (sl, socket, ms, lastcell, 2)) 1158 {
1159 lastcell.player = player;
1160
1314 mask |= 0x4; 1161 mask |= 0x8;
1162 *last_ext |= 0x80;
1163 last_ext = &sl[sl.length ()];
1315 1164
1316 /* Middle face */ 1165 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1317 if (update_space (sl, socket, ms, lastcell, 1)) 1166 }
1167
1168 if (expect_false (lastcell.flags != flags))
1169 {
1170 lastcell.flags = flags;
1171
1318 mask |= 0x2; 1172 mask |= 0x8;
1173 *last_ext |= 0x80;
1174 last_ext = &sl[sl.length ()];
1319 1175
1320 if (ms.player () == ob 1176 sl << uint8 (8) << uint8 (flags);
1321 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1322 { 1177 }
1178 }
1179
1180 /* Floor face */
1181 if (update_space (sl, socket, ms, lastcell, 2))
1182 mask |= 0x4;
1183
1184 /* Middle face */
1185 if (update_space (sl, socket, ms, lastcell, 1))
1186 mask |= 0x2;
1187
1188 if (expect_false (ob->invisible)
1189 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1190 && ms.player () == ob)
1191 {
1323 // force player to be visible to himself if invisible 1192 // force player to be visible to himself if invisible
1324 if (lastcell.faces[0] != ob->face) 1193 if (lastcell.faces[0] != ob->face)
1325 { 1194 {
1326 lastcell.faces[0] = ob->face; 1195 lastcell.faces[0] = ob->face;
1327 1196
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; 1197 mask |= 0x1;
1198 sl << uint16 (ob->face);
1337 1199
1200 socket.send_faces (ob);
1201 }
1202 }
1203 /* Top face */
1204 else if (update_space (sl, socket, ms, lastcell, 0))
1205 mask |= 0x1;
1206
1338 /* Check to see if we are in fact sending anything for this 1207 /* Check to see if we are in fact sending anything for this
1339 * space by checking the mask. If so, update the mask. 1208 * space by checking the mask. If so, update the mask.
1340 * if not, reset the len to that from before adding the mask 1209 * if not, reset the len to that from before adding the mask
1341 * value, so we don't send those bits. 1210 * value, so we don't send those bits.
1342 */ 1211 */
1343 if (mask & 0xf) 1212 if (mask & 0xf)
1344 sl[oldlen + 1] = mask & 0xff; 1213 sl[oldlen + 1] = mask & 0xff;
1345 else 1214 else
1346 sl.reset (oldlen); 1215 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 */ 1216 } /* else this is a viewable space */
1377 } /* for x loop */ 1217 ordered_mapwalk_end
1378 } /* for y loop */
1379 1218
1380 socket.flush_fx (); 1219 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 1220
1398 if (sl.length () > startlen || socket.sent_scroll) 1221 if (sl.length () > startlen || socket.sent_scroll)
1399 { 1222 {
1400 socket.send_packet (sl); 1223 socket.send_packet (sl);
1401 socket.sent_scroll = 0; 1224 socket.sent_scroll = 0;
1422{ 1245{
1423 packet sl; 1246 packet sl;
1424 sl << "replyinfo skill_info\n"; 1247 sl << "replyinfo skill_info\n";
1425 1248
1426 for (int i = 1; i < NUM_SKILLS; i++) 1249 for (int i = 1; i < NUM_SKILLS; i++)
1427 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1250 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1428 1251
1429 if (sl.length () > MAXSOCKBUF) 1252 if (sl.length () > MAXSOCKBUF)
1430 { 1253 {
1431 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1254 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1432 fatal (0); 1255 fatal (0);
1476 if (spell->type == SPELL) 1299 if (spell->type == SPELL)
1477 { 1300 {
1478 int flags = 0; 1301 int flags = 0;
1479 1302
1480 /* check if we need to update it */ 1303 /* check if we need to update it */
1481 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1304 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1482 { 1305 {
1483 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1306 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1484 flags |= UPD_SP_MANA; 1307 flags |= UPD_SP_MANA;
1485 } 1308 }
1486 1309
1487 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1310 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1488 { 1311 {
1489 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1312 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1490 flags |= UPD_SP_GRACE; 1313 flags |= UPD_SP_GRACE;
1491 } 1314 }
1492 1315
1493 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1316 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1494 { 1317 {
1495 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1318 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1496 flags |= UPD_SP_DAMAGE; 1319 flags |= UPD_SP_DAMAGE;
1497 } 1320 }
1498 1321
1499 if (flags) 1322 if (flags)
1500 { 1323 {
1502 1325
1503 sl << "updspell " 1326 sl << "updspell "
1504 << uint8 (flags) 1327 << uint8 (flags)
1505 << uint32 (spell->count); 1328 << uint32 (spell->count);
1506 1329
1507 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1330 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1508 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1331 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1509 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1332 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1510 1333
1511 pl->ns->send_packet (sl); 1334 pl->ns->send_packet (sl);
1512 } 1335 }
1513 } 1336 }
1514 } 1337 }
1544 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1367 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1545 return; 1368 return;
1546 } 1369 }
1547 1370
1548 /* store costs and damage in the object struct, to compare to later */ 1371 /* 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); 1372 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); 1373 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); 1374 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1552 1375
1553 /* figure out which skill it uses, if it uses one */ 1376 /* figure out which skill it uses, if it uses one */
1554 if (spell->skill) 1377 if (spell->skill)
1555 { 1378 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; 1379 skill = tmp->subtype + CS_STAT_SKILLINFO;
1560 break;
1561 }
1562 }
1563 1380
1564 // spells better have a face 1381 // spells better have a face
1565 if (!spell->face) 1382 if (!spell->face)
1566 { 1383 {
1567 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1384 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1572 1389
1573 /* send the current values */ 1390 /* send the current values */
1574 sl << uint32 (spell->count) 1391 sl << uint32 (spell->count)
1575 << uint16 (spell->level) 1392 << uint16 (spell->level)
1576 << uint16 (spell->casting_time) 1393 << uint16 (spell->casting_time)
1577 << uint16 (spell->last_sp) 1394 << uint16 (spell->cached_sp)
1578 << uint16 (spell->last_grace) 1395 << uint16 (spell->cached_grace)
1579 << uint16 (spell->last_eat) 1396 << uint16 (spell->cached_eat)
1580 << uint8 (skill) 1397 << uint8 (skill)
1581 << uint32 (spell->path_attuned) 1398 << uint32 (spell->path_attuned)
1582 << uint32 (spell->face) 1399 << uint32 (spell->face)
1583 << data8 (spell->name) 1400 << data8 (spell->name)
1584 << data16 (spell->msg); 1401 << data16 (spell->msg);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines