ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.125 by root, Tue Apr 22 04:33:20 2008 UTC vs.
Revision 1.143 by root, Tue Dec 23 06:58:24 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
… …
686 * syntax is: move (to) (tag) (nrof) 710 * syntax is: move (to) (tag) (nrof)
687 */ 711 */
688void 712void
689MoveCmd (char *buf, int len, player *pl) 713MoveCmd (char *buf, int len, player *pl)
690{ 714{
691 int vals[3], i; 715 int to, tag, nrof;
692 716
693 /* A little funky here. We only cycle for 2 records, because 717 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 { 718 {
700 vals[i] = atoi (buf);
701
702 if (!(buf = strchr (buf, ' ')))
703 {
704 LOG (llevError, "Incomplete move command: %s\n", buf); 719 LOG (llevError, "Incomplete move command: %s\n", buf);
705 return; 720 return;
706 }
707
708 buf++;
709 } 721 }
710 722
711 vals[2] = atoi (buf); 723 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} 724}
716 725
717/****************************************************************************** 726/******************************************************************************
718 * 727 *
719 * Start of commands the server sends to the client. 728 * Start of commands the server sends to the client.
… …
820 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 829 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
821 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 830 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
822 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 831 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
823 832
824 for (int s = 0; s < NUM_SKILLS; s++) 833 for (int s = 0; s < NUM_SKILLS; s++)
825 if (object *skill = opl->last_skill_ob[s]) 834 if (object *skill = opl->last_skill_ob [s])
826 if (skill->stats.exp != ns->last_skill_exp [s]) 835 if (skill->stats.exp != ns->last_skill_exp [s])
827 { 836 {
828 ns->last_skill_exp [s] = skill->stats.exp; 837 ns->last_skill_exp [s] = skill->stats.exp;
829 838
830 /* Always send along the level if exp changes. This is only 839 /* Always send along the level if exp changes. This is only
… …
886 895
887/** 896/**
888 * Tells the client that here is a player it should start using. 897 * Tells the client that here is a player it should start using.
889 */ 898 */
890void 899void
891esrv_new_player (player *pl, uint32 weight) 900esrv_new_player (player *pl)
892{ 901{
902 sint32 weight = pl->ob->client_weight ();
903
893 packet sl ("player"); 904 packet sl ("player");
894 905
895 sl << uint32 (pl->ob->count) 906 sl << uint32 (pl->ob->count)
896 << uint32 (weight) 907 << uint32 (weight)
897 << uint32 (pl->ob->face) 908 << uint32 (pl->ob->face)
898 << data8 (pl->ob->name); 909 << data8 (pl->ob->name);
899 910
900 pl->ns->last_weight = weight; 911 pl->ns->last_weight = weight;
901 pl->ns->send_packet (sl); 912 pl->ns->send_packet (sl);
902 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
903} 913}
904 914
905/****************************************************************************** 915/******************************************************************************
906 * 916 *
907 * Start of map related commands. 917 * Start of map related commands.
… …
1025{ 1035{
1026 object *ob = pl->observe; 1036 object *ob = pl->observe;
1027 if (!ob->active) 1037 if (!ob->active)
1028 return; 1038 return;
1029 1039
1030 maptile *plmap = ob->map;
1031
1032 /* 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
1033 * 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
1034 * be OK once they really log in. 1042 * be OK once they really log in.
1035 */ 1043 */
1036 if (!plmap || plmap->in_memory != MAP_ACTIVE) 1044 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1037 return; 1045 return;
1038 1046
1039 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1047 int startlen, oldlen;
1040 int estartlen, eoldlen; 1048 int estartlen, eoldlen;
1041 uint8 eentrysize; 1049 uint8 eentrysize;
1042 uint16 ewhatstart, ewhatflag; 1050 uint16 ewhatstart, ewhatflag;
1043 uint8 extendedinfos; 1051 uint8 extendedinfos;
1044 1052
1045 check_map_change (pl); 1053 check_map_change (pl);
1046 prefetch_surrounding_maps (pl->ob); 1054 prefetch_surrounding_maps (pl->ob);
1047 1055
1048 /* do LOS after calls to update_position */ 1056 /* do LOS after calls to update_position */
1049 if (ob != pl->ob) 1057 /* unfortunately, we need to udpate los when observing, currently */
1050 clear_los (pl); 1058 if (pl->do_los || pl->observe != pl->ob)
1051 else if (pl->do_los)
1052 { 1059 {
1053 update_los (ob);
1054 pl->do_los = 0; 1060 pl->do_los = 0;
1061 pl->update_los ();
1055 } 1062 }
1056 1063
1057 /** 1064 /**
1058 * 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
1059 * 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
… …
1101 << uint8 (eentrysize); 1108 << uint8 (eentrysize);
1102 1109
1103 estartlen = esl.length (); 1110 estartlen = esl.length ();
1104 } 1111 }
1105 1112
1106 /* x,y are the real map locations. ax, ay are viewport relative
1107 * locations.
1108 */
1109 ay = 0;
1110
1111 /* We could do this logic as conditionals in the if statement, 1113 /* We could do this logic as conditionals in the if statement,
1112 * but that started to get a bit messy to look at. 1114 * but that started to get a bit messy to look at.
1113 */ 1115 */
1114 max_x = ob->x + (socket.mapx + 1) / 2; 1116 int hx = socket.mapx / 2;
1115 max_y = ob->y + (socket.mapy + 1) / 2; 1117 int hy = socket.mapy / 2;
1116 1118
1117 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++) 1119 for (int dx = -hx; dx <= hx; dx++)
1118 { 1120 {
1119 sint16 nx, ny; 1121 sint16 nx, ny;
1120 maptile *m = 0; 1122 maptile *m = 0;
1121 1123
1122 ax = 0; 1124 for (int dy = -hy; dy <= hy; dy++)
1123 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1124 { 1125 {
1125 // check to see if we can simply go one right quickly 1126 // check to see if we can simply go one down quickly
1126 ++nx;
1127 if (m && nx >= m->width) 1127 if (m && ++ny >= m->height)
1128 m = 0; 1128 m = 0;
1129 1129
1130 // no, so do it the slow way
1130 if (!m) 1131 if (!m)
1131 { 1132 {
1132 nx = x; ny = y; m = plmap; 1133 nx = ob->x + dx; ny = ob->y + dy; m = ob->map;
1133 1134
1134 if (xy_normalise (m, nx, ny)) 1135 if (xy_normalise (m, nx, ny))
1135 m->touch (); 1136 m->touch ();
1136 else 1137 else
1137 m = 0; 1138 m = 0;
1138 } 1139 }
1139 1140
1141 int ax = dx + hx;
1142 int ay = dy + hy;
1143
1140 int emask, mask; 1144 int emask, mask;
1141 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1145 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1142 1146
1143 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1147 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1144 1148
1145 /* 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,
1146 * we tell the client as such 1150 * we tell the client as such
1147 */ 1151 */
1148 if (!m) 1152 if (!m)
1149 { 1153 {
1150 /* space is out of map. Update space and clear values 1154 /* space is out of map. Update space and clear values
1151 * 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
1152 * of the map, it shouldn't have a head 1156 * of the map, it shouldn't have a head.
1153 */ 1157 */
1154 if (lastcell.count != -1) 1158 if (lastcell.count != -1)
1155 { 1159 {
1156 sl << uint16 (mask); 1160 sl << uint16 (mask);
1157 map_clearcell (&lastcell, -1); 1161 map_clearcell (&lastcell, -1);
1158 } 1162 }
1159 1163
1160 continue; 1164 continue;
1161 } 1165 }
1162 1166
1163 int d = pl->blocked_los[ax][ay]; 1167 int d = pl->blocked_los_uc (dx, dy);
1164 1168
1165 if (d > 3) 1169 if (d > 3)
1166 { 1170 {
1167
1168 int need_send = 0, count; 1171 int need_send = 0, count;
1169 1172
1170 /* This block deals with spaces that are not visible for whatever 1173 /* This block deals with spaces that are not visible for whatever
1171 * reason. Still may need to send the head for this space. 1174 * reason. Still may need to send the head for this space.
1172 */ 1175 */
… …
1178 if (lastcell.count != -1) 1181 if (lastcell.count != -1)
1179 need_send = 1; 1182 need_send = 1;
1180 1183
1181 count = -1; 1184 count = -1;
1182 1185
1183 /* properly clear a previously sent big face */
1184 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2] 1186 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1185 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1187 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1186 need_send = 1; 1188 need_send = 1;
1187 1189
1190 /* properly clear a previously sent big face */
1188 map_clearcell (&lastcell, count); 1191 map_clearcell (&lastcell, count);
1189 1192
1190 if ((mask & 0xf) || need_send) 1193 if ((mask & 0xf) || need_send)
1191 sl[oldlen + 1] = mask & 0xff; 1194 sl[oldlen + 1] = mask & 0xff;
1192 else 1195 else
… …
1248 { 1251 {
1249 if (op->stats.maxhp > op->stats.hp 1252 if (op->stats.maxhp > op->stats.hp
1250 && op->stats.maxhp > 0 1253 && op->stats.maxhp > 0
1251 && (op->type == PLAYER 1254 && (op->type == PLAYER
1252 || op->type == DOOR // does not work, have maxhp 0 1255 || op->type == DOOR // does not work, have maxhp 0
1253 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))) 1256 || QUERY_FLAG (op, FLAG_MONSTER)
1257 || QUERY_FLAG (op, FLAG_ALIVE)
1258 || QUERY_FLAG (op, FLAG_GENERATOR)))
1254 { 1259 {
1255 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1260 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1256 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge 1261 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1257 } 1262 }
1258 1263
1259 if (op->msg && op->msg[0] == '@') 1264 if (op->has_dialogue ())
1260 flags |= 1; 1265 flags |= 1;
1261 1266
1262 if (op->type == PLAYER && op != ob) 1267 if (op->type == PLAYER)
1263 player = op->count; 1268 player = op == ob ? pl->ob->count
1269 : op == pl->ob ? ob->count
1270 : op->count;
1264 } 1271 }
1265 1272
1266 if (lastcell.stat_hp != stat_hp) 1273 if (lastcell.stat_hp != stat_hp)
1267 { 1274 {
1268 lastcell.stat_hp = stat_hp; 1275 lastcell.stat_hp = stat_hp;
… …
1311 1318
1312 /* Middle face */ 1319 /* Middle face */
1313 if (update_space (sl, socket, ms, lastcell, 1)) 1320 if (update_space (sl, socket, ms, lastcell, 1))
1314 mask |= 0x2; 1321 mask |= 0x2;
1315 1322
1323 if (ob->invisible
1324 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1316 if (ms.player () == ob 1325 && ms.player () == ob)
1317 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1318 { 1326 {
1319 // force player to be visible to himself if invisible 1327 // force player to be visible to himself if invisible
1320 if (lastcell.faces[0] != ob->face) 1328 if (lastcell.faces[0] != ob->face)
1321 { 1329 {
1322 lastcell.faces[0] = ob->face; 1330 lastcell.faces[0] = ob->face;
… …
1418{ 1426{
1419 packet sl; 1427 packet sl;
1420 sl << "replyinfo skill_info\n"; 1428 sl << "replyinfo skill_info\n";
1421 1429
1422 for (int i = 1; i < NUM_SKILLS; i++) 1430 for (int i = 1; i < NUM_SKILLS; i++)
1423 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]);
1424 1432
1425 if (sl.length () > MAXSOCKBUF) 1433 if (sl.length () > MAXSOCKBUF)
1426 { 1434 {
1427 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1435 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1428 fatal (0); 1436 fatal (0);
… …
1472 if (spell->type == SPELL) 1480 if (spell->type == SPELL)
1473 { 1481 {
1474 int flags = 0; 1482 int flags = 0;
1475 1483
1476 /* check if we need to update it */ 1484 /* check if we need to update it */
1477 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))
1478 { 1486 {
1479 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);
1480 flags |= UPD_SP_MANA; 1488 flags |= UPD_SP_MANA;
1481 } 1489 }
1482 1490
1483 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))
1484 { 1492 {
1485 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);
1486 flags |= UPD_SP_GRACE; 1494 flags |= UPD_SP_GRACE;
1487 } 1495 }
1488 1496
1489 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))
1490 { 1498 {
1491 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);
1492 flags |= UPD_SP_DAMAGE; 1500 flags |= UPD_SP_DAMAGE;
1493 } 1501 }
1494 1502
1495 if (flags) 1503 if (flags)
1496 { 1504 {
… …
1498 1506
1499 sl << "updspell " 1507 sl << "updspell "
1500 << uint8 (flags) 1508 << uint8 (flags)
1501 << uint32 (spell->count); 1509 << uint32 (spell->count);
1502 1510
1503 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1511 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1504 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1512 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1505 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1513 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1506 1514
1507 pl->ns->send_packet (sl); 1515 pl->ns->send_packet (sl);
1508 } 1516 }
1509 } 1517 }
1510 } 1518 }
… …
1540 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);
1541 return; 1549 return;
1542 } 1550 }
1543 1551
1544 /* 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 */
1545 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);
1546 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);
1547 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);
1548 1556
1549 /* figure out which skill it uses, if it uses one */ 1557 /* figure out which skill it uses, if it uses one */
1550 if (spell->skill) 1558 if (spell->skill)
1551 { 1559 if (object *tmp = pl->find_skill (spell->skill))
1552 for (i = 1; i < NUM_SKILLS; i++)
1553 if (!strcmp (spell->skill, skill_names[i]))
1554 {
1555 skill = i + CS_STAT_SKILLINFO; 1560 skill = tmp->subtype + CS_STAT_SKILLINFO;
1556 break;
1557 }
1558 }
1559 1561
1560 // spells better have a face 1562 // spells better have a face
1561 if (!spell->face) 1563 if (!spell->face)
1562 { 1564 {
1563 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);
… …
1568 1570
1569 /* send the current values */ 1571 /* send the current values */
1570 sl << uint32 (spell->count) 1572 sl << uint32 (spell->count)
1571 << uint16 (spell->level) 1573 << uint16 (spell->level)
1572 << uint16 (spell->casting_time) 1574 << uint16 (spell->casting_time)
1573 << uint16 (spell->last_sp) 1575 << uint16 (spell->cached_sp)
1574 << uint16 (spell->last_grace) 1576 << uint16 (spell->cached_grace)
1575 << uint16 (spell->last_eat) 1577 << uint16 (spell->cached_eat)
1576 << uint8 (skill) 1578 << uint8 (skill)
1577 << uint32 (spell->path_attuned) 1579 << uint32 (spell->path_attuned)
1578 << uint32 (spell->face) 1580 << uint32 (spell->face)
1579 << data8 (spell->name) 1581 << data8 (spell->name)
1580 << data16 (spell->msg); 1582 << data16 (spell->msg);

Diff Legend

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