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.130 by root, Tue May 20 03:14:19 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
153 // first try to aovid a full newmap on tiled map scrolls 182 // first try to aovid a full newmap on tiled map scrolls
154 if (socket.current_map != ob->map) 183 if (socket.current_map != ob->map && !socket.force_newmap)
155 { 184 {
156 rv_vector rv; 185 rv_vector rv;
157 186
158 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0); 187 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
159 188
… …
164 socket.current_x = ob->x; 193 socket.current_x = ob->x;
165 socket.current_y = ob->y; 194 socket.current_y = ob->y;
166 195
167 socket_map_scroll (&socket, rv.distance_x, rv.distance_y); 196 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
168 socket.floorbox_reset (); 197 socket.floorbox_reset ();
198 send_map_info (pl);
169 } 199 }
170 } 200 }
171 201
172 if (socket.current_map != ob->map || socket.force_newmap) 202 if (socket.current_map != ob->map || socket.force_newmap)
173 { 203 {
174 clear_map (pl); 204 clear_map (pl);
175 socket.current_map = ob->map; 205 socket.current_map = ob->map;
176 206 send_map_info (pl);
177 if (socket.mapinfocmd)
178 {
179 if (ob->map && ob->map->path[0])
180 {
181 int flags = 0;
182
183 if (ob->map->tile_path[0]) flags |= 1;
184 if (ob->map->tile_path[1]) flags |= 2;
185 if (ob->map->tile_path[2]) flags |= 4;
186 if (ob->map->tile_path[3]) flags |= 8;
187
188 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
189 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
190 ob->map->width, ob->map->height, &ob->map->path);
191 }
192 else
193 socket.send_packet ("mapinfo current");
194 }
195 } 207 }
196 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)
197 { 209 {
198 int dx = ob->x - socket.current_x; 210 int dx = ob->x - socket.current_x;
199 int dy = ob->y - socket.current_y; 211 int dy = ob->y - socket.current_y;
… …
207 } 219 }
208 } 220 }
209 221
210 socket.current_x = ob->x; 222 socket.current_x = ob->x;
211 socket.current_y = ob->y; 223 socket.current_y = ob->y;
212
213 region *reg = ob->region ();
214 if (socket.current_region != reg)
215 {
216 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
217 socket.current_region = reg;
218 }
219} 224}
220 225
221/** 226/**
222 * RequestInfo is sort of a meta command. There is some specific 227 * RequestInfo is sort of a meta command. There is some specific
223 * request of information, but we call other functions to provide 228 * request of information, but we call other functions to provide
… …
824 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 829 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
825 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 830 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
826 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 831 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
827 832
828 for (int s = 0; s < NUM_SKILLS; s++) 833 for (int s = 0; s < NUM_SKILLS; s++)
829 if (object *skill = opl->last_skill_ob[s]) 834 if (object *skill = opl->last_skill_ob [s])
830 if (skill->stats.exp != ns->last_skill_exp [s]) 835 if (skill->stats.exp != ns->last_skill_exp [s])
831 { 836 {
832 ns->last_skill_exp [s] = skill->stats.exp; 837 ns->last_skill_exp [s] = skill->stats.exp;
833 838
834 /* Always send along the level if exp changes. This is only 839 /* Always send along the level if exp changes. This is only
… …
903 << uint32 (pl->ob->face) 908 << uint32 (pl->ob->face)
904 << data8 (pl->ob->name); 909 << data8 (pl->ob->name);
905 910
906 pl->ns->last_weight = weight; 911 pl->ns->last_weight = weight;
907 pl->ns->send_packet (sl); 912 pl->ns->send_packet (sl);
908 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
909} 913}
910 914
911/****************************************************************************** 915/******************************************************************************
912 * 916 *
913 * Start of map related commands. 917 * Start of map related commands.
… …
1031{ 1035{
1032 object *ob = pl->observe; 1036 object *ob = pl->observe;
1033 if (!ob->active) 1037 if (!ob->active)
1034 return; 1038 return;
1035 1039
1036 maptile *plmap = ob->map;
1037
1038 /* 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
1039 * 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
1040 * be OK once they really log in. 1042 * be OK once they really log in.
1041 */ 1043 */
1042 if (!plmap || plmap->in_memory != MAP_ACTIVE) 1044 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1043 return; 1045 return;
1044 1046
1045 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1047 int startlen, oldlen;
1046 int estartlen, eoldlen; 1048 int estartlen, eoldlen;
1047 uint8 eentrysize; 1049 uint8 eentrysize;
1048 uint16 ewhatstart, ewhatflag; 1050 uint16 ewhatstart, ewhatflag;
1049 uint8 extendedinfos; 1051 uint8 extendedinfos;
1050 1052
1051 check_map_change (pl); 1053 check_map_change (pl);
1052 prefetch_surrounding_maps (pl->ob); 1054 prefetch_surrounding_maps (pl->ob);
1053 1055
1054 /* do LOS after calls to update_position */ 1056 /* do LOS after calls to update_position */
1055 if (ob != pl->ob) 1057 /* unfortunately, we need to udpate los when observing, currently */
1056 clear_los (pl); 1058 if (pl->do_los || pl->observe != pl->ob)
1057 else if (pl->do_los)
1058 { 1059 {
1059 update_los (ob);
1060 pl->do_los = 0; 1060 pl->do_los = 0;
1061 pl->update_los ();
1061 } 1062 }
1062 1063
1063 /** 1064 /**
1064 * 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
1065 * 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
… …
1107 << uint8 (eentrysize); 1108 << uint8 (eentrysize);
1108 1109
1109 estartlen = esl.length (); 1110 estartlen = esl.length ();
1110 } 1111 }
1111 1112
1112 /* x,y are the real map locations. ax, ay are viewport relative
1113 * locations.
1114 */
1115 ay = 0;
1116
1117 /* We could do this logic as conditionals in the if statement, 1113 /* We could do this logic as conditionals in the if statement,
1118 * but that started to get a bit messy to look at. 1114 * but that started to get a bit messy to look at.
1119 */ 1115 */
1120 max_x = ob->x + (socket.mapx + 1) / 2; 1116 int hx = socket.mapx / 2;
1121 max_y = ob->y + (socket.mapy + 1) / 2; 1117 int hy = socket.mapy / 2;
1122 1118
1123 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++) 1119 for (int dx = -hx; dx <= hx; dx++)
1124 { 1120 {
1125 sint16 nx, ny; 1121 sint16 nx, ny;
1126 maptile *m = 0; 1122 maptile *m = 0;
1127 1123
1128 ax = 0; 1124 for (int dy = -hy; dy <= hy; dy++)
1129 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1130 { 1125 {
1131 // check to see if we can simply go one right quickly 1126 // check to see if we can simply go one down quickly
1132 ++nx;
1133 if (m && nx >= m->width) 1127 if (m && ++ny >= m->height)
1134 m = 0; 1128 m = 0;
1135 1129
1130 // no, so do it the slow way
1136 if (!m) 1131 if (!m)
1137 { 1132 {
1138 nx = x; ny = y; m = plmap; 1133 nx = ob->x + dx; ny = ob->y + dy; m = ob->map;
1139 1134
1140 if (xy_normalise (m, nx, ny)) 1135 if (xy_normalise (m, nx, ny))
1141 m->touch (); 1136 m->touch ();
1142 else 1137 else
1143 m = 0; 1138 m = 0;
1144 } 1139 }
1145 1140
1141 int ax = dx + hx;
1142 int ay = dy + hy;
1143
1146 int emask, mask; 1144 int emask, mask;
1147 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1145 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1148 1146
1149 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1147 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1150 1148
1151 /* 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,
1152 * we tell the client as such 1150 * we tell the client as such
1153 */ 1151 */
1154 if (!m) 1152 if (!m)
1155 { 1153 {
1156 /* space is out of map. Update space and clear values 1154 /* space is out of map. Update space and clear values
1157 * 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
1158 * of the map, it shouldn't have a head 1156 * of the map, it shouldn't have a head.
1159 */ 1157 */
1160 if (lastcell.count != -1) 1158 if (lastcell.count != -1)
1161 { 1159 {
1162 sl << uint16 (mask); 1160 sl << uint16 (mask);
1163 map_clearcell (&lastcell, -1); 1161 map_clearcell (&lastcell, -1);
1164 } 1162 }
1165 1163
1166 continue; 1164 continue;
1167 } 1165 }
1168 1166
1169 int d = pl->blocked_los[ax][ay]; 1167 int d = pl->blocked_los_uc (dx, dy);
1170 1168
1171 if (d > 3) 1169 if (d > 3)
1172 { 1170 {
1173
1174 int need_send = 0, count; 1171 int need_send = 0, count;
1175 1172
1176 /* This block deals with spaces that are not visible for whatever 1173 /* This block deals with spaces that are not visible for whatever
1177 * reason. Still may need to send the head for this space. 1174 * reason. Still may need to send the head for this space.
1178 */ 1175 */
… …
1184 if (lastcell.count != -1) 1181 if (lastcell.count != -1)
1185 need_send = 1; 1182 need_send = 1;
1186 1183
1187 count = -1; 1184 count = -1;
1188 1185
1189 /* properly clear a previously sent big face */
1190 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2] 1186 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1191 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1187 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1192 need_send = 1; 1188 need_send = 1;
1193 1189
1190 /* properly clear a previously sent big face */
1194 map_clearcell (&lastcell, count); 1191 map_clearcell (&lastcell, count);
1195 1192
1196 if ((mask & 0xf) || need_send) 1193 if ((mask & 0xf) || need_send)
1197 sl[oldlen + 1] = mask & 0xff; 1194 sl[oldlen + 1] = mask & 0xff;
1198 else 1195 else
… …
1254 { 1251 {
1255 if (op->stats.maxhp > op->stats.hp 1252 if (op->stats.maxhp > op->stats.hp
1256 && op->stats.maxhp > 0 1253 && op->stats.maxhp > 0
1257 && (op->type == PLAYER 1254 && (op->type == PLAYER
1258 || op->type == DOOR // does not work, have maxhp 0 1255 || op->type == DOOR // does not work, have maxhp 0
1259 || 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)))
1260 { 1259 {
1261 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1260 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1262 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
1263 } 1262 }
1264 1263
1265 if (op->msg && op->msg[0] == '@') 1264 if (op->has_dialogue ())
1266 flags |= 1; 1265 flags |= 1;
1267 1266
1268 if (op->type == PLAYER && op != ob) 1267 if (op->type == PLAYER)
1269 player = op->count; 1268 player = op == ob ? pl->ob->count
1269 : op == pl->ob ? ob->count
1270 : op->count;
1270 } 1271 }
1271 1272
1272 if (lastcell.stat_hp != stat_hp) 1273 if (lastcell.stat_hp != stat_hp)
1273 { 1274 {
1274 lastcell.stat_hp = stat_hp; 1275 lastcell.stat_hp = stat_hp;
… …
1317 1318
1318 /* Middle face */ 1319 /* Middle face */
1319 if (update_space (sl, socket, ms, lastcell, 1)) 1320 if (update_space (sl, socket, ms, lastcell, 1))
1320 mask |= 0x2; 1321 mask |= 0x2;
1321 1322
1323 if (ob->invisible
1324 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1322 if (ms.player () == ob 1325 && ms.player () == ob)
1323 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1324 { 1326 {
1325 // force player to be visible to himself if invisible 1327 // force player to be visible to himself if invisible
1326 if (lastcell.faces[0] != ob->face) 1328 if (lastcell.faces[0] != ob->face)
1327 { 1329 {
1328 lastcell.faces[0] = ob->face; 1330 lastcell.faces[0] = ob->face;
… …
1424{ 1426{
1425 packet sl; 1427 packet sl;
1426 sl << "replyinfo skill_info\n"; 1428 sl << "replyinfo skill_info\n";
1427 1429
1428 for (int i = 1; i < NUM_SKILLS; i++) 1430 for (int i = 1; i < NUM_SKILLS; i++)
1429 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]);
1430 1432
1431 if (sl.length () > MAXSOCKBUF) 1433 if (sl.length () > MAXSOCKBUF)
1432 { 1434 {
1433 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1435 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1434 fatal (0); 1436 fatal (0);
… …
1478 if (spell->type == SPELL) 1480 if (spell->type == SPELL)
1479 { 1481 {
1480 int flags = 0; 1482 int flags = 0;
1481 1483
1482 /* check if we need to update it */ 1484 /* check if we need to update it */
1483 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))
1484 { 1486 {
1485 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);
1486 flags |= UPD_SP_MANA; 1488 flags |= UPD_SP_MANA;
1487 } 1489 }
1488 1490
1489 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))
1490 { 1492 {
1491 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);
1492 flags |= UPD_SP_GRACE; 1494 flags |= UPD_SP_GRACE;
1493 } 1495 }
1494 1496
1495 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))
1496 { 1498 {
1497 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);
1498 flags |= UPD_SP_DAMAGE; 1500 flags |= UPD_SP_DAMAGE;
1499 } 1501 }
1500 1502
1501 if (flags) 1503 if (flags)
1502 { 1504 {
… …
1504 1506
1505 sl << "updspell " 1507 sl << "updspell "
1506 << uint8 (flags) 1508 << uint8 (flags)
1507 << uint32 (spell->count); 1509 << uint32 (spell->count);
1508 1510
1509 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1511 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1510 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1512 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1511 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1513 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1512 1514
1513 pl->ns->send_packet (sl); 1515 pl->ns->send_packet (sl);
1514 } 1516 }
1515 } 1517 }
1516 } 1518 }
… …
1546 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);
1547 return; 1549 return;
1548 } 1550 }
1549 1551
1550 /* 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 */
1551 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);
1552 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);
1553 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);
1554 1556
1555 /* figure out which skill it uses, if it uses one */ 1557 /* figure out which skill it uses, if it uses one */
1556 if (spell->skill) 1558 if (spell->skill)
1557 { 1559 if (object *tmp = pl->find_skill (spell->skill))
1558 for (i = 1; i < NUM_SKILLS; i++)
1559 if (!strcmp (spell->skill, skill_names[i]))
1560 {
1561 skill = i + CS_STAT_SKILLINFO; 1560 skill = tmp->subtype + CS_STAT_SKILLINFO;
1562 break;
1563 }
1564 }
1565 1561
1566 // spells better have a face 1562 // spells better have a face
1567 if (!spell->face) 1563 if (!spell->face)
1568 { 1564 {
1569 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);
… …
1574 1570
1575 /* send the current values */ 1571 /* send the current values */
1576 sl << uint32 (spell->count) 1572 sl << uint32 (spell->count)
1577 << uint16 (spell->level) 1573 << uint16 (spell->level)
1578 << uint16 (spell->casting_time) 1574 << uint16 (spell->casting_time)
1579 << uint16 (spell->last_sp) 1575 << uint16 (spell->cached_sp)
1580 << uint16 (spell->last_grace) 1576 << uint16 (spell->cached_grace)
1581 << uint16 (spell->last_eat) 1577 << uint16 (spell->cached_eat)
1582 << uint8 (skill) 1578 << uint8 (skill)
1583 << uint32 (spell->path_attuned) 1579 << uint32 (spell->path_attuned)
1584 << uint32 (spell->face) 1580 << uint32 (spell->face)
1585 << data8 (spell->name) 1581 << data8 (spell->name)
1586 << data16 (spell->msg); 1582 << data16 (spell->msg);

Diff Legend

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