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.141 by root, Fri Dec 19 22:47:30 2008 UTC

… …
141 pl->ns->send_packet ("newmap"); 141 pl->ns->send_packet ("newmap");
142 142
143 pl->ns->floorbox_reset (); 143 pl->ns->floorbox_reset ();
144} 144}
145 145
146static void
147send_map_info (player *pl)
148{
149 client &socket = *pl->ns;
150 object *ob = pl->observe;
151
152 if (socket.mapinfocmd)
153 {
154 if (ob->map && ob->map->path[0])
155 {
156 int flags = 0;
157
158 if (ob->map->tile_path[0]) flags |= 1;
159 if (ob->map->tile_path[1]) flags |= 2;
160 if (ob->map->tile_path[2]) flags |= 4;
161 if (ob->map->tile_path[3]) flags |= 8;
162
163 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
164 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
165 ob->map->width, ob->map->height, &ob->map->path);
166 }
167 else
168 socket.send_packet ("mapinfo current");
169 }
170}
171
146/** check for map/region change and send new map data */ 172/** check for map/region change and send new map data */
147static void 173static void
148check_map_change (player *pl) 174check_map_change (player *pl)
149{ 175{
150 client &socket = *pl->ns; 176 client &socket = *pl->ns;
151 object *ob = pl->observe; 177 object *ob = pl->observe;
152 178
179 region *reg = ob->region ();
180 if (socket.current_region != reg)
181 {
182 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
183 socket.current_region = reg;
184 }
185
153 // first try to aovid a full newmap on tiled map scrolls 186 // first try to aovid a full newmap on tiled map scrolls
154 if (socket.current_map != ob->map) 187 if (socket.current_map != ob->map && !socket.force_newmap)
155 { 188 {
156 rv_vector rv; 189 rv_vector rv;
157 190
158 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0); 191 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
159 192
… …
164 socket.current_x = ob->x; 197 socket.current_x = ob->x;
165 socket.current_y = ob->y; 198 socket.current_y = ob->y;
166 199
167 socket_map_scroll (&socket, rv.distance_x, rv.distance_y); 200 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
168 socket.floorbox_reset (); 201 socket.floorbox_reset ();
202 send_map_info (pl);
169 } 203 }
170 } 204 }
171 205
172 if (socket.current_map != ob->map || socket.force_newmap) 206 if (socket.current_map != ob->map || socket.force_newmap)
173 { 207 {
174 clear_map (pl); 208 clear_map (pl);
175 socket.current_map = ob->map; 209 socket.current_map = ob->map;
176 210 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 } 211 }
196 else if (socket.current_x != ob->x || socket.current_y != ob->y) 212 else if (socket.current_x != ob->x || socket.current_y != ob->y)
197 { 213 {
198 int dx = ob->x - socket.current_x; 214 int dx = ob->x - socket.current_x;
199 int dy = ob->y - socket.current_y; 215 int dy = ob->y - socket.current_y;
… …
207 } 223 }
208 } 224 }
209 225
210 socket.current_x = ob->x; 226 socket.current_x = ob->x;
211 socket.current_y = ob->y; 227 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} 228}
220 229
221/** 230/**
222 * RequestInfo is sort of a meta command. There is some specific 231 * RequestInfo is sort of a meta command. There is some specific
223 * request of information, but we call other functions to provide 232 * request of information, but we call other functions to provide
… …
824 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 833 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
825 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 834 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
826 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 835 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
827 836
828 for (int s = 0; s < NUM_SKILLS; s++) 837 for (int s = 0; s < NUM_SKILLS; s++)
829 if (object *skill = opl->last_skill_ob[s]) 838 if (object *skill = opl->last_skill_ob [s])
830 if (skill->stats.exp != ns->last_skill_exp [s]) 839 if (skill->stats.exp != ns->last_skill_exp [s])
831 { 840 {
832 ns->last_skill_exp [s] = skill->stats.exp; 841 ns->last_skill_exp [s] = skill->stats.exp;
833 842
834 /* Always send along the level if exp changes. This is only 843 /* Always send along the level if exp changes. This is only
… …
903 << uint32 (pl->ob->face) 912 << uint32 (pl->ob->face)
904 << data8 (pl->ob->name); 913 << data8 (pl->ob->name);
905 914
906 pl->ns->last_weight = weight; 915 pl->ns->last_weight = weight;
907 pl->ns->send_packet (sl); 916 pl->ns->send_packet (sl);
908 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
909} 917}
910 918
911/****************************************************************************** 919/******************************************************************************
912 * 920 *
913 * Start of map related commands. 921 * Start of map related commands.
… …
1031{ 1039{
1032 object *ob = pl->observe; 1040 object *ob = pl->observe;
1033 if (!ob->active) 1041 if (!ob->active)
1034 return; 1042 return;
1035 1043
1036 maptile *plmap = ob->map;
1037
1038 /* If player is just joining the game, he isn't here yet, so the map 1044 /* 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 1045 * can get swapped out. If so, don't try to send them a map. All will
1040 * be OK once they really log in. 1046 * be OK once they really log in.
1041 */ 1047 */
1042 if (!plmap || plmap->in_memory != MAP_ACTIVE) 1048 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1043 return; 1049 return;
1044 1050
1045 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1051 int startlen, oldlen;
1046 int estartlen, eoldlen; 1052 int estartlen, eoldlen;
1047 uint8 eentrysize; 1053 uint8 eentrysize;
1048 uint16 ewhatstart, ewhatflag; 1054 uint16 ewhatstart, ewhatflag;
1049 uint8 extendedinfos; 1055 uint8 extendedinfos;
1050 1056
… …
1107 << uint8 (eentrysize); 1113 << uint8 (eentrysize);
1108 1114
1109 estartlen = esl.length (); 1115 estartlen = esl.length ();
1110 } 1116 }
1111 1117
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, 1118 /* We could do this logic as conditionals in the if statement,
1118 * but that started to get a bit messy to look at. 1119 * but that started to get a bit messy to look at.
1119 */ 1120 */
1120 max_x = ob->x + (socket.mapx + 1) / 2; 1121 int hx = socket.mapx / 2;
1121 max_y = ob->y + (socket.mapy + 1) / 2; 1122 int hy = socket.mapy / 2;
1122 1123
1123 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++) 1124 for (int dx = -hx; dx <= hx; dx++)
1124 { 1125 {
1125 sint16 nx, ny; 1126 sint16 nx, ny;
1126 maptile *m = 0; 1127 maptile *m = 0;
1127 1128
1128 ax = 0; 1129 for (int dy = -hy; dy <= hy; dy++)
1129 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1130 { 1130 {
1131 // check to see if we can simply go one right quickly 1131 // check to see if we can simply go one down quickly
1132 ++nx;
1133 if (m && nx >= m->width) 1132 if (m && ++ny >= m->height)
1134 m = 0; 1133 m = 0;
1135 1134
1135 // no, so do it the slow way
1136 if (!m) 1136 if (!m)
1137 { 1137 {
1138 nx = x; ny = y; m = plmap; 1138 nx = ob->x + dx; ny = ob->y + dy; m = ob->map;
1139 1139
1140 if (xy_normalise (m, nx, ny)) 1140 if (xy_normalise (m, nx, ny))
1141 m->touch (); 1141 m->touch ();
1142 else 1142 else
1143 m = 0; 1143 m = 0;
1144 } 1144 }
1145 1145
1146 int ax = dx + hx;
1147 int ay = dy + hy;
1148
1146 int emask, mask; 1149 int emask, mask;
1147 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1150 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1148 1151
1149 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1152 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1150 1153
1151 /* If the coordinates are not valid, or it is too dark to see, 1154 /* If the coordinates are not valid, or it is too dark to see,
1152 * we tell the client as such 1155 * we tell the client as such
1153 */ 1156 */
1154 if (!m) 1157 if (!m)
1155 { 1158 {
1156 /* space is out of map. Update space and clear values 1159 /* space is out of map. Update space and clear values
1157 * if this hasn't already been done. If the space is out 1160 * if this hasn't already been done. If the space is out
1158 * of the map, it shouldn't have a head 1161 * of the map, it shouldn't have a head.
1159 */ 1162 */
1160 if (lastcell.count != -1) 1163 if (lastcell.count != -1)
1161 { 1164 {
1162 sl << uint16 (mask); 1165 sl << uint16 (mask);
1163 map_clearcell (&lastcell, -1); 1166 map_clearcell (&lastcell, -1);
1164 } 1167 }
1165 1168
1166 continue; 1169 continue;
1167 } 1170 }
1168 1171
1169 int d = pl->blocked_los[ax][ay]; 1172 int d = pl->blocked_los_uc (dx, dy);
1170 1173
1171 if (d > 3) 1174 if (d > 3)
1172 { 1175 {
1173
1174 int need_send = 0, count; 1176 int need_send = 0, count;
1175 1177
1176 /* This block deals with spaces that are not visible for whatever 1178 /* This block deals with spaces that are not visible for whatever
1177 * reason. Still may need to send the head for this space. 1179 * reason. Still may need to send the head for this space.
1178 */ 1180 */
… …
1184 if (lastcell.count != -1) 1186 if (lastcell.count != -1)
1185 need_send = 1; 1187 need_send = 1;
1186 1188
1187 count = -1; 1189 count = -1;
1188 1190
1189 /* properly clear a previously sent big face */
1190 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2] 1191 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1191 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1192 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1192 need_send = 1; 1193 need_send = 1;
1193 1194
1195 /* properly clear a previously sent big face */
1194 map_clearcell (&lastcell, count); 1196 map_clearcell (&lastcell, count);
1195 1197
1196 if ((mask & 0xf) || need_send) 1198 if ((mask & 0xf) || need_send)
1197 sl[oldlen + 1] = mask & 0xff; 1199 sl[oldlen + 1] = mask & 0xff;
1198 else 1200 else
… …
1254 { 1256 {
1255 if (op->stats.maxhp > op->stats.hp 1257 if (op->stats.maxhp > op->stats.hp
1256 && op->stats.maxhp > 0 1258 && op->stats.maxhp > 0
1257 && (op->type == PLAYER 1259 && (op->type == PLAYER
1258 || op->type == DOOR // does not work, have maxhp 0 1260 || 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))) 1261 || QUERY_FLAG (op, FLAG_MONSTER)
1262 || QUERY_FLAG (op, FLAG_ALIVE)
1263 || QUERY_FLAG (op, FLAG_GENERATOR)))
1260 { 1264 {
1261 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1265 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 1266 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1263 } 1267 }
1264 1268
1265 if (op->msg && op->msg[0] == '@') 1269 if (op->has_dialogue ())
1266 flags |= 1; 1270 flags |= 1;
1267 1271
1268 if (op->type == PLAYER && op != ob) 1272 if (op->type == PLAYER)
1269 player = op->count; 1273 player = op == ob ? pl->ob->count
1274 : op == pl->ob ? ob->count
1275 : op->count;
1270 } 1276 }
1271 1277
1272 if (lastcell.stat_hp != stat_hp) 1278 if (lastcell.stat_hp != stat_hp)
1273 { 1279 {
1274 lastcell.stat_hp = stat_hp; 1280 lastcell.stat_hp = stat_hp;
… …
1317 1323
1318 /* Middle face */ 1324 /* Middle face */
1319 if (update_space (sl, socket, ms, lastcell, 1)) 1325 if (update_space (sl, socket, ms, lastcell, 1))
1320 mask |= 0x2; 1326 mask |= 0x2;
1321 1327
1328 if (ob->invisible
1329 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1322 if (ms.player () == ob 1330 && ms.player () == ob)
1323 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1324 { 1331 {
1325 // force player to be visible to himself if invisible 1332 // force player to be visible to himself if invisible
1326 if (lastcell.faces[0] != ob->face) 1333 if (lastcell.faces[0] != ob->face)
1327 { 1334 {
1328 lastcell.faces[0] = ob->face; 1335 lastcell.faces[0] = ob->face;
… …
1424{ 1431{
1425 packet sl; 1432 packet sl;
1426 sl << "replyinfo skill_info\n"; 1433 sl << "replyinfo skill_info\n";
1427 1434
1428 for (int i = 1; i < NUM_SKILLS; i++) 1435 for (int i = 1; i < NUM_SKILLS; i++)
1429 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1436 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1430 1437
1431 if (sl.length () > MAXSOCKBUF) 1438 if (sl.length () > MAXSOCKBUF)
1432 { 1439 {
1433 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1440 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1434 fatal (0); 1441 fatal (0);
… …
1478 if (spell->type == SPELL) 1485 if (spell->type == SPELL)
1479 { 1486 {
1480 int flags = 0; 1487 int flags = 0;
1481 1488
1482 /* check if we need to update it */ 1489 /* check if we need to update it */
1483 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1490 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1484 { 1491 {
1485 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1492 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1486 flags |= UPD_SP_MANA; 1493 flags |= UPD_SP_MANA;
1487 } 1494 }
1488 1495
1489 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1496 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1490 { 1497 {
1491 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1498 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1492 flags |= UPD_SP_GRACE; 1499 flags |= UPD_SP_GRACE;
1493 } 1500 }
1494 1501
1495 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1502 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1496 { 1503 {
1497 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1504 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1498 flags |= UPD_SP_DAMAGE; 1505 flags |= UPD_SP_DAMAGE;
1499 } 1506 }
1500 1507
1501 if (flags) 1508 if (flags)
1502 { 1509 {
… …
1504 1511
1505 sl << "updspell " 1512 sl << "updspell "
1506 << uint8 (flags) 1513 << uint8 (flags)
1507 << uint32 (spell->count); 1514 << uint32 (spell->count);
1508 1515
1509 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1516 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1510 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1517 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1511 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1518 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1512 1519
1513 pl->ns->send_packet (sl); 1520 pl->ns->send_packet (sl);
1514 } 1521 }
1515 } 1522 }
1516 } 1523 }
… …
1546 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1553 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1547 return; 1554 return;
1548 } 1555 }
1549 1556
1550 /* store costs and damage in the object struct, to compare to later */ 1557 /* 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); 1558 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); 1559 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); 1560 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1554 1561
1555 /* figure out which skill it uses, if it uses one */ 1562 /* figure out which skill it uses, if it uses one */
1556 if (spell->skill) 1563 if (spell->skill)
1557 { 1564 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; 1565 skill = tmp->subtype + CS_STAT_SKILLINFO;
1562 break;
1563 }
1564 }
1565 1566
1566 // spells better have a face 1567 // spells better have a face
1567 if (!spell->face) 1568 if (!spell->face)
1568 { 1569 {
1569 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1570 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
… …
1574 1575
1575 /* send the current values */ 1576 /* send the current values */
1576 sl << uint32 (spell->count) 1577 sl << uint32 (spell->count)
1577 << uint16 (spell->level) 1578 << uint16 (spell->level)
1578 << uint16 (spell->casting_time) 1579 << uint16 (spell->casting_time)
1579 << uint16 (spell->last_sp) 1580 << uint16 (spell->cached_sp)
1580 << uint16 (spell->last_grace) 1581 << uint16 (spell->cached_grace)
1581 << uint16 (spell->last_eat) 1582 << uint16 (spell->cached_eat)
1582 << uint8 (skill) 1583 << uint8 (skill)
1583 << uint32 (spell->path_attuned) 1584 << uint32 (spell->path_attuned)
1584 << uint32 (spell->face) 1585 << uint32 (spell->face)
1585 << data8 (spell->name) 1586 << data8 (spell->name)
1586 << data16 (spell->msg); 1587 << data16 (spell->msg);

Diff Legend

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