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.129 by root, Tue May 6 19:37:01 2008 UTC vs.
Revision 1.143 by root, Tue Dec 23 06:58:24 2008 UTC

… …
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
… …
805 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 829 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
806 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 830 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
807 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 831 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
808 832
809 for (int s = 0; s < NUM_SKILLS; s++) 833 for (int s = 0; s < NUM_SKILLS; s++)
810 if (object *skill = opl->last_skill_ob[s]) 834 if (object *skill = opl->last_skill_ob [s])
811 if (skill->stats.exp != ns->last_skill_exp [s]) 835 if (skill->stats.exp != ns->last_skill_exp [s])
812 { 836 {
813 ns->last_skill_exp [s] = skill->stats.exp; 837 ns->last_skill_exp [s] = skill->stats.exp;
814 838
815 /* Always send along the level if exp changes. This is only 839 /* Always send along the level if exp changes. This is only
… …
884 << uint32 (pl->ob->face) 908 << uint32 (pl->ob->face)
885 << data8 (pl->ob->name); 909 << data8 (pl->ob->name);
886 910
887 pl->ns->last_weight = weight; 911 pl->ns->last_weight = weight;
888 pl->ns->send_packet (sl); 912 pl->ns->send_packet (sl);
889 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
890} 913}
891 914
892/****************************************************************************** 915/******************************************************************************
893 * 916 *
894 * Start of map related commands. 917 * Start of map related commands.
… …
1012{ 1035{
1013 object *ob = pl->observe; 1036 object *ob = pl->observe;
1014 if (!ob->active) 1037 if (!ob->active)
1015 return; 1038 return;
1016 1039
1017 maptile *plmap = ob->map;
1018
1019 /* If player is just joining the game, he isn't here yet, so the map 1040 /* If player is just joining the game, he isn't here yet, so the map
1020 * can get swapped out. If so, don't try to send them a map. All will 1041 * can get swapped out. If so, don't try to send them a map. All will
1021 * be OK once they really log in. 1042 * be OK once they really log in.
1022 */ 1043 */
1023 if (!plmap || plmap->in_memory != MAP_ACTIVE) 1044 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1024 return; 1045 return;
1025 1046
1026 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1047 int startlen, oldlen;
1027 int estartlen, eoldlen; 1048 int estartlen, eoldlen;
1028 uint8 eentrysize; 1049 uint8 eentrysize;
1029 uint16 ewhatstart, ewhatflag; 1050 uint16 ewhatstart, ewhatflag;
1030 uint8 extendedinfos; 1051 uint8 extendedinfos;
1031 1052
1032 check_map_change (pl); 1053 check_map_change (pl);
1033 prefetch_surrounding_maps (pl->ob); 1054 prefetch_surrounding_maps (pl->ob);
1034 1055
1035 /* do LOS after calls to update_position */ 1056 /* do LOS after calls to update_position */
1036 if (ob != pl->ob) 1057 /* unfortunately, we need to udpate los when observing, currently */
1037 clear_los (pl); 1058 if (pl->do_los || pl->observe != pl->ob)
1038 else if (pl->do_los)
1039 { 1059 {
1040 update_los (ob);
1041 pl->do_los = 0; 1060 pl->do_los = 0;
1061 pl->update_los ();
1042 } 1062 }
1043 1063
1044 /** 1064 /**
1045 * This function uses the new map1 protocol command to send the map 1065 * This function uses the new map1 protocol command to send the map
1046 * to the client. It is necessary because the old map command supports 1066 * to the client. It is necessary because the old map command supports
… …
1088 << uint8 (eentrysize); 1108 << uint8 (eentrysize);
1089 1109
1090 estartlen = esl.length (); 1110 estartlen = esl.length ();
1091 } 1111 }
1092 1112
1093 /* x,y are the real map locations. ax, ay are viewport relative
1094 * locations.
1095 */
1096 ay = 0;
1097
1098 /* We could do this logic as conditionals in the if statement, 1113 /* We could do this logic as conditionals in the if statement,
1099 * but that started to get a bit messy to look at. 1114 * but that started to get a bit messy to look at.
1100 */ 1115 */
1101 max_x = ob->x + (socket.mapx + 1) / 2; 1116 int hx = socket.mapx / 2;
1102 max_y = ob->y + (socket.mapy + 1) / 2; 1117 int hy = socket.mapy / 2;
1103 1118
1104 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++) 1119 for (int dx = -hx; dx <= hx; dx++)
1105 { 1120 {
1106 sint16 nx, ny; 1121 sint16 nx, ny;
1107 maptile *m = 0; 1122 maptile *m = 0;
1108 1123
1109 ax = 0; 1124 for (int dy = -hy; dy <= hy; dy++)
1110 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1111 { 1125 {
1112 // check to see if we can simply go one right quickly 1126 // check to see if we can simply go one down quickly
1113 ++nx;
1114 if (m && nx >= m->width) 1127 if (m && ++ny >= m->height)
1115 m = 0; 1128 m = 0;
1116 1129
1130 // no, so do it the slow way
1117 if (!m) 1131 if (!m)
1118 { 1132 {
1119 nx = x; ny = y; m = plmap; 1133 nx = ob->x + dx; ny = ob->y + dy; m = ob->map;
1120 1134
1121 if (xy_normalise (m, nx, ny)) 1135 if (xy_normalise (m, nx, ny))
1122 m->touch (); 1136 m->touch ();
1123 else 1137 else
1124 m = 0; 1138 m = 0;
1125 } 1139 }
1126 1140
1141 int ax = dx + hx;
1142 int ay = dy + hy;
1143
1127 int emask, mask; 1144 int emask, mask;
1128 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1145 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1129 1146
1130 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1147 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1131 1148
1132 /* If the coordinates are not valid, or it is too dark to see, 1149 /* If the coordinates are not valid, or it is too dark to see,
1133 * we tell the client as such 1150 * we tell the client as such
1134 */ 1151 */
1135 if (!m) 1152 if (!m)
1136 { 1153 {
1137 /* space is out of map. Update space and clear values 1154 /* space is out of map. Update space and clear values
1138 * if this hasn't already been done. If the space is out 1155 * if this hasn't already been done. If the space is out
1139 * of the map, it shouldn't have a head 1156 * of the map, it shouldn't have a head.
1140 */ 1157 */
1141 if (lastcell.count != -1) 1158 if (lastcell.count != -1)
1142 { 1159 {
1143 sl << uint16 (mask); 1160 sl << uint16 (mask);
1144 map_clearcell (&lastcell, -1); 1161 map_clearcell (&lastcell, -1);
1145 } 1162 }
1146 1163
1147 continue; 1164 continue;
1148 } 1165 }
1149 1166
1150 int d = pl->blocked_los[ax][ay]; 1167 int d = pl->blocked_los_uc (dx, dy);
1151 1168
1152 if (d > 3) 1169 if (d > 3)
1153 { 1170 {
1154
1155 int need_send = 0, count; 1171 int need_send = 0, count;
1156 1172
1157 /* This block deals with spaces that are not visible for whatever 1173 /* This block deals with spaces that are not visible for whatever
1158 * reason. Still may need to send the head for this space. 1174 * reason. Still may need to send the head for this space.
1159 */ 1175 */
… …
1165 if (lastcell.count != -1) 1181 if (lastcell.count != -1)
1166 need_send = 1; 1182 need_send = 1;
1167 1183
1168 count = -1; 1184 count = -1;
1169 1185
1170 /* properly clear a previously sent big face */
1171 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2] 1186 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1172 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1187 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1173 need_send = 1; 1188 need_send = 1;
1174 1189
1190 /* properly clear a previously sent big face */
1175 map_clearcell (&lastcell, count); 1191 map_clearcell (&lastcell, count);
1176 1192
1177 if ((mask & 0xf) || need_send) 1193 if ((mask & 0xf) || need_send)
1178 sl[oldlen + 1] = mask & 0xff; 1194 sl[oldlen + 1] = mask & 0xff;
1179 else 1195 else
… …
1235 { 1251 {
1236 if (op->stats.maxhp > op->stats.hp 1252 if (op->stats.maxhp > op->stats.hp
1237 && op->stats.maxhp > 0 1253 && op->stats.maxhp > 0
1238 && (op->type == PLAYER 1254 && (op->type == PLAYER
1239 || op->type == DOOR // does not work, have maxhp 0 1255 || op->type == DOOR // does not work, have maxhp 0
1240 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))) 1256 || QUERY_FLAG (op, FLAG_MONSTER)
1257 || QUERY_FLAG (op, FLAG_ALIVE)
1258 || QUERY_FLAG (op, FLAG_GENERATOR)))
1241 { 1259 {
1242 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1260 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1243 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge 1261 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1244 } 1262 }
1245 1263
1246 if (op->msg && op->msg[0] == '@') 1264 if (op->has_dialogue ())
1247 flags |= 1; 1265 flags |= 1;
1248 1266
1249 if (op->type == PLAYER && op != ob) 1267 if (op->type == PLAYER)
1250 player = op->count; 1268 player = op == ob ? pl->ob->count
1269 : op == pl->ob ? ob->count
1270 : op->count;
1251 } 1271 }
1252 1272
1253 if (lastcell.stat_hp != stat_hp) 1273 if (lastcell.stat_hp != stat_hp)
1254 { 1274 {
1255 lastcell.stat_hp = stat_hp; 1275 lastcell.stat_hp = stat_hp;
… …
1298 1318
1299 /* Middle face */ 1319 /* Middle face */
1300 if (update_space (sl, socket, ms, lastcell, 1)) 1320 if (update_space (sl, socket, ms, lastcell, 1))
1301 mask |= 0x2; 1321 mask |= 0x2;
1302 1322
1323 if (ob->invisible
1324 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1303 if (ms.player () == ob 1325 && ms.player () == ob)
1304 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1305 { 1326 {
1306 // force player to be visible to himself if invisible 1327 // force player to be visible to himself if invisible
1307 if (lastcell.faces[0] != ob->face) 1328 if (lastcell.faces[0] != ob->face)
1308 { 1329 {
1309 lastcell.faces[0] = ob->face; 1330 lastcell.faces[0] = ob->face;
… …
1405{ 1426{
1406 packet sl; 1427 packet sl;
1407 sl << "replyinfo skill_info\n"; 1428 sl << "replyinfo skill_info\n";
1408 1429
1409 for (int i = 1; i < NUM_SKILLS; i++) 1430 for (int i = 1; i < NUM_SKILLS; i++)
1410 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1431 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1411 1432
1412 if (sl.length () > MAXSOCKBUF) 1433 if (sl.length () > MAXSOCKBUF)
1413 { 1434 {
1414 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1435 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1415 fatal (0); 1436 fatal (0);
… …
1459 if (spell->type == SPELL) 1480 if (spell->type == SPELL)
1460 { 1481 {
1461 int flags = 0; 1482 int flags = 0;
1462 1483
1463 /* check if we need to update it */ 1484 /* check if we need to update it */
1464 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1485 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1465 { 1486 {
1466 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1487 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1467 flags |= UPD_SP_MANA; 1488 flags |= UPD_SP_MANA;
1468 } 1489 }
1469 1490
1470 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1491 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1471 { 1492 {
1472 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1493 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1473 flags |= UPD_SP_GRACE; 1494 flags |= UPD_SP_GRACE;
1474 } 1495 }
1475 1496
1476 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1497 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1477 { 1498 {
1478 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1499 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1479 flags |= UPD_SP_DAMAGE; 1500 flags |= UPD_SP_DAMAGE;
1480 } 1501 }
1481 1502
1482 if (flags) 1503 if (flags)
1483 { 1504 {
… …
1485 1506
1486 sl << "updspell " 1507 sl << "updspell "
1487 << uint8 (flags) 1508 << uint8 (flags)
1488 << uint32 (spell->count); 1509 << uint32 (spell->count);
1489 1510
1490 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1511 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1491 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1512 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1492 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1513 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1493 1514
1494 pl->ns->send_packet (sl); 1515 pl->ns->send_packet (sl);
1495 } 1516 }
1496 } 1517 }
1497 } 1518 }
… …
1527 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1548 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1528 return; 1549 return;
1529 } 1550 }
1530 1551
1531 /* store costs and damage in the object struct, to compare to later */ 1552 /* store costs and damage in the object struct, to compare to later */
1532 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1553 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1533 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1554 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1534 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1555 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1535 1556
1536 /* figure out which skill it uses, if it uses one */ 1557 /* figure out which skill it uses, if it uses one */
1537 if (spell->skill) 1558 if (spell->skill)
1538 { 1559 if (object *tmp = pl->find_skill (spell->skill))
1539 for (i = 1; i < NUM_SKILLS; i++)
1540 if (!strcmp (spell->skill, skill_names[i]))
1541 {
1542 skill = i + CS_STAT_SKILLINFO; 1560 skill = tmp->subtype + CS_STAT_SKILLINFO;
1543 break;
1544 }
1545 }
1546 1561
1547 // spells better have a face 1562 // spells better have a face
1548 if (!spell->face) 1563 if (!spell->face)
1549 { 1564 {
1550 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1565 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
… …
1555 1570
1556 /* send the current values */ 1571 /* send the current values */
1557 sl << uint32 (spell->count) 1572 sl << uint32 (spell->count)
1558 << uint16 (spell->level) 1573 << uint16 (spell->level)
1559 << uint16 (spell->casting_time) 1574 << uint16 (spell->casting_time)
1560 << uint16 (spell->last_sp) 1575 << uint16 (spell->cached_sp)
1561 << uint16 (spell->last_grace) 1576 << uint16 (spell->cached_grace)
1562 << uint16 (spell->last_eat) 1577 << uint16 (spell->cached_eat)
1563 << uint8 (skill) 1578 << uint8 (skill)
1564 << uint32 (spell->path_attuned) 1579 << uint32 (spell->path_attuned)
1565 << uint32 (spell->face) 1580 << uint32 (spell->face)
1566 << data8 (spell->name) 1581 << data8 (spell->name)
1567 << data16 (spell->msg); 1582 << data16 (spell->msg);

Diff Legend

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