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.128 by root, Tue May 6 16:55:26 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
186 // first try to aovid a full newmap on tiled map scrolls
187 if (socket.current_map != ob->map && !socket.force_newmap)
188 {
189 rv_vector rv;
190
191 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
192
193 // manhattan distance is very handy here
194 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
195 {
196 socket.current_map = ob->map;
197 socket.current_x = ob->x;
198 socket.current_y = ob->y;
199
200 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
201 socket.floorbox_reset ();
202 send_map_info (pl);
203 }
204 }
205
153 if (socket.current_map != ob->map || socket.force_newmap) 206 if (socket.current_map != ob->map || socket.force_newmap)
154 { 207 {
155 clear_map (pl); 208 clear_map (pl);
156 socket.current_map = ob->map; 209 socket.current_map = ob->map;
157 210 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 } 211 }
177 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)
178 { 213 {
179 int dx = ob->x - socket.current_x; 214 int dx = ob->x - socket.current_x;
180 int dy = ob->y - socket.current_y; 215 int dy = ob->y - socket.current_y;
… …
188 } 223 }
189 } 224 }
190 225
191 socket.current_x = ob->x; 226 socket.current_x = ob->x;
192 socket.current_y = ob->y; 227 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} 228}
201 229
202/** 230/**
203 * RequestInfo is sort of a meta command. There is some specific 231 * RequestInfo is sort of a meta command. There is some specific
204 * request of information, but we call other functions to provide 232 * request of information, but we call other functions to provide
… …
686 * syntax is: move (to) (tag) (nrof) 714 * syntax is: move (to) (tag) (nrof)
687 */ 715 */
688void 716void
689MoveCmd (char *buf, int len, player *pl) 717MoveCmd (char *buf, int len, player *pl)
690{ 718{
691 int vals[3], i; 719 int to, tag, nrof;
692 720
693 /* A little funky here. We only cycle for 2 records, because 721 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 { 722 {
700 vals[i] = atoi (buf);
701
702 if (!(buf = strchr (buf, ' ')))
703 {
704 LOG (llevError, "Incomplete move command: %s\n", buf); 723 LOG (llevError, "Incomplete move command: %s\n", buf);
705 return; 724 return;
706 }
707
708 buf++;
709 } 725 }
710 726
711 vals[2] = atoi (buf); 727 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} 728}
716 729
717/****************************************************************************** 730/******************************************************************************
718 * 731 *
719 * Start of commands the server sends to the client. 732 * Start of commands the server sends to the client.
… …
820 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 833 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
821 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 834 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
822 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 835 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
823 836
824 for (int s = 0; s < NUM_SKILLS; s++) 837 for (int s = 0; s < NUM_SKILLS; s++)
825 if (object *skill = opl->last_skill_ob[s]) 838 if (object *skill = opl->last_skill_ob [s])
826 if (skill->stats.exp != ns->last_skill_exp [s]) 839 if (skill->stats.exp != ns->last_skill_exp [s])
827 { 840 {
828 ns->last_skill_exp [s] = skill->stats.exp; 841 ns->last_skill_exp [s] = skill->stats.exp;
829 842
830 /* Always send along the level if exp changes. This is only 843 /* Always send along the level if exp changes. This is only
… …
899 << uint32 (pl->ob->face) 912 << uint32 (pl->ob->face)
900 << data8 (pl->ob->name); 913 << data8 (pl->ob->name);
901 914
902 pl->ns->last_weight = weight; 915 pl->ns->last_weight = weight;
903 pl->ns->send_packet (sl); 916 pl->ns->send_packet (sl);
904 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
905} 917}
906 918
907/****************************************************************************** 919/******************************************************************************
908 * 920 *
909 * Start of map related commands. 921 * Start of map related commands.
… …
1027{ 1039{
1028 object *ob = pl->observe; 1040 object *ob = pl->observe;
1029 if (!ob->active) 1041 if (!ob->active)
1030 return; 1042 return;
1031 1043
1032 maptile *plmap = ob->map;
1033
1034 /* 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
1035 * 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
1036 * be OK once they really log in. 1046 * be OK once they really log in.
1037 */ 1047 */
1038 if (!plmap || plmap->in_memory != MAP_ACTIVE) 1048 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1039 return; 1049 return;
1040 1050
1041 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1051 int startlen, oldlen;
1042 int estartlen, eoldlen; 1052 int estartlen, eoldlen;
1043 uint8 eentrysize; 1053 uint8 eentrysize;
1044 uint16 ewhatstart, ewhatflag; 1054 uint16 ewhatstart, ewhatflag;
1045 uint8 extendedinfos; 1055 uint8 extendedinfos;
1046 1056
… …
1103 << uint8 (eentrysize); 1113 << uint8 (eentrysize);
1104 1114
1105 estartlen = esl.length (); 1115 estartlen = esl.length ();
1106 } 1116 }
1107 1117
1108 /* x,y are the real map locations. ax, ay are viewport relative
1109 * locations.
1110 */
1111 ay = 0;
1112
1113 /* We could do this logic as conditionals in the if statement, 1118 /* We could do this logic as conditionals in the if statement,
1114 * but that started to get a bit messy to look at. 1119 * but that started to get a bit messy to look at.
1115 */ 1120 */
1116 max_x = ob->x + (socket.mapx + 1) / 2; 1121 int hx = socket.mapx / 2;
1117 max_y = ob->y + (socket.mapy + 1) / 2; 1122 int hy = socket.mapy / 2;
1118 1123
1119 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++) 1124 for (int dx = -hx; dx <= hx; dx++)
1120 { 1125 {
1121 sint16 nx, ny; 1126 sint16 nx, ny;
1122 maptile *m = 0; 1127 maptile *m = 0;
1123 1128
1124 ax = 0; 1129 for (int dy = -hy; dy <= hy; dy++)
1125 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1126 { 1130 {
1127 // check to see if we can simply go one right quickly 1131 // check to see if we can simply go one down quickly
1128 ++nx;
1129 if (m && nx >= m->width) 1132 if (m && ++ny >= m->height)
1130 m = 0; 1133 m = 0;
1131 1134
1135 // no, so do it the slow way
1132 if (!m) 1136 if (!m)
1133 { 1137 {
1134 nx = x; ny = y; m = plmap; 1138 nx = ob->x + dx; ny = ob->y + dy; m = ob->map;
1135 1139
1136 if (xy_normalise (m, nx, ny)) 1140 if (xy_normalise (m, nx, ny))
1137 m->touch (); 1141 m->touch ();
1138 else 1142 else
1139 m = 0; 1143 m = 0;
1140 } 1144 }
1141 1145
1146 int ax = dx + hx;
1147 int ay = dy + hy;
1148
1142 int emask, mask; 1149 int emask, mask;
1143 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1150 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1144 1151
1145 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1152 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1146 1153
1147 /* 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,
1148 * we tell the client as such 1155 * we tell the client as such
1149 */ 1156 */
1150 if (!m) 1157 if (!m)
1151 { 1158 {
1152 /* space is out of map. Update space and clear values 1159 /* space is out of map. Update space and clear values
1153 * 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
1154 * of the map, it shouldn't have a head 1161 * of the map, it shouldn't have a head.
1155 */ 1162 */
1156 if (lastcell.count != -1) 1163 if (lastcell.count != -1)
1157 { 1164 {
1158 sl << uint16 (mask); 1165 sl << uint16 (mask);
1159 map_clearcell (&lastcell, -1); 1166 map_clearcell (&lastcell, -1);
1160 } 1167 }
1161 1168
1162 continue; 1169 continue;
1163 } 1170 }
1164 1171
1165 int d = pl->blocked_los[ax][ay]; 1172 int d = pl->blocked_los_uc (dx, dy);
1166 1173
1167 if (d > 3) 1174 if (d > 3)
1168 { 1175 {
1169
1170 int need_send = 0, count; 1176 int need_send = 0, count;
1171 1177
1172 /* This block deals with spaces that are not visible for whatever 1178 /* This block deals with spaces that are not visible for whatever
1173 * reason. Still may need to send the head for this space. 1179 * reason. Still may need to send the head for this space.
1174 */ 1180 */
… …
1180 if (lastcell.count != -1) 1186 if (lastcell.count != -1)
1181 need_send = 1; 1187 need_send = 1;
1182 1188
1183 count = -1; 1189 count = -1;
1184 1190
1185 /* properly clear a previously sent big face */
1186 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2] 1191 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1187 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1192 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1188 need_send = 1; 1193 need_send = 1;
1189 1194
1195 /* properly clear a previously sent big face */
1190 map_clearcell (&lastcell, count); 1196 map_clearcell (&lastcell, count);
1191 1197
1192 if ((mask & 0xf) || need_send) 1198 if ((mask & 0xf) || need_send)
1193 sl[oldlen + 1] = mask & 0xff; 1199 sl[oldlen + 1] = mask & 0xff;
1194 else 1200 else
… …
1250 { 1256 {
1251 if (op->stats.maxhp > op->stats.hp 1257 if (op->stats.maxhp > op->stats.hp
1252 && op->stats.maxhp > 0 1258 && op->stats.maxhp > 0
1253 && (op->type == PLAYER 1259 && (op->type == PLAYER
1254 || op->type == DOOR // does not work, have maxhp 0 1260 || op->type == DOOR // does not work, have maxhp 0
1255 || 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)))
1256 { 1264 {
1257 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1265 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1258 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
1259 } 1267 }
1260 1268
1261 if (op->msg && op->msg[0] == '@') 1269 if (op->has_dialogue ())
1262 flags |= 1; 1270 flags |= 1;
1263 1271
1264 if (op->type == PLAYER && op != ob) 1272 if (op->type == PLAYER)
1265 player = op->count; 1273 player = op == ob ? pl->ob->count
1274 : op == pl->ob ? ob->count
1275 : op->count;
1266 } 1276 }
1267 1277
1268 if (lastcell.stat_hp != stat_hp) 1278 if (lastcell.stat_hp != stat_hp)
1269 { 1279 {
1270 lastcell.stat_hp = stat_hp; 1280 lastcell.stat_hp = stat_hp;
… …
1313 1323
1314 /* Middle face */ 1324 /* Middle face */
1315 if (update_space (sl, socket, ms, lastcell, 1)) 1325 if (update_space (sl, socket, ms, lastcell, 1))
1316 mask |= 0x2; 1326 mask |= 0x2;
1317 1327
1328 if (ob->invisible
1329 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1318 if (ms.player () == ob 1330 && ms.player () == ob)
1319 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1320 { 1331 {
1321 // force player to be visible to himself if invisible 1332 // force player to be visible to himself if invisible
1322 if (lastcell.faces[0] != ob->face) 1333 if (lastcell.faces[0] != ob->face)
1323 { 1334 {
1324 lastcell.faces[0] = ob->face; 1335 lastcell.faces[0] = ob->face;
… …
1420{ 1431{
1421 packet sl; 1432 packet sl;
1422 sl << "replyinfo skill_info\n"; 1433 sl << "replyinfo skill_info\n";
1423 1434
1424 for (int i = 1; i < NUM_SKILLS; i++) 1435 for (int i = 1; i < NUM_SKILLS; i++)
1425 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]);
1426 1437
1427 if (sl.length () > MAXSOCKBUF) 1438 if (sl.length () > MAXSOCKBUF)
1428 { 1439 {
1429 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1440 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1430 fatal (0); 1441 fatal (0);
… …
1474 if (spell->type == SPELL) 1485 if (spell->type == SPELL)
1475 { 1486 {
1476 int flags = 0; 1487 int flags = 0;
1477 1488
1478 /* check if we need to update it */ 1489 /* check if we need to update it */
1479 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))
1480 { 1491 {
1481 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);
1482 flags |= UPD_SP_MANA; 1493 flags |= UPD_SP_MANA;
1483 } 1494 }
1484 1495
1485 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))
1486 { 1497 {
1487 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);
1488 flags |= UPD_SP_GRACE; 1499 flags |= UPD_SP_GRACE;
1489 } 1500 }
1490 1501
1491 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))
1492 { 1503 {
1493 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);
1494 flags |= UPD_SP_DAMAGE; 1505 flags |= UPD_SP_DAMAGE;
1495 } 1506 }
1496 1507
1497 if (flags) 1508 if (flags)
1498 { 1509 {
… …
1500 1511
1501 sl << "updspell " 1512 sl << "updspell "
1502 << uint8 (flags) 1513 << uint8 (flags)
1503 << uint32 (spell->count); 1514 << uint32 (spell->count);
1504 1515
1505 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1516 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1506 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1517 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1507 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1518 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1508 1519
1509 pl->ns->send_packet (sl); 1520 pl->ns->send_packet (sl);
1510 } 1521 }
1511 } 1522 }
1512 } 1523 }
… …
1542 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);
1543 return; 1554 return;
1544 } 1555 }
1545 1556
1546 /* 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 */
1547 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);
1548 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);
1549 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);
1550 1561
1551 /* figure out which skill it uses, if it uses one */ 1562 /* figure out which skill it uses, if it uses one */
1552 if (spell->skill) 1563 if (spell->skill)
1553 { 1564 if (object *tmp = pl->find_skill (spell->skill))
1554 for (i = 1; i < NUM_SKILLS; i++)
1555 if (!strcmp (spell->skill, skill_names[i]))
1556 {
1557 skill = i + CS_STAT_SKILLINFO; 1565 skill = tmp->subtype + CS_STAT_SKILLINFO;
1558 break;
1559 }
1560 }
1561 1566
1562 // spells better have a face 1567 // spells better have a face
1563 if (!spell->face) 1568 if (!spell->face)
1564 { 1569 {
1565 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);
… …
1570 1575
1571 /* send the current values */ 1576 /* send the current values */
1572 sl << uint32 (spell->count) 1577 sl << uint32 (spell->count)
1573 << uint16 (spell->level) 1578 << uint16 (spell->level)
1574 << uint16 (spell->casting_time) 1579 << uint16 (spell->casting_time)
1575 << uint16 (spell->last_sp) 1580 << uint16 (spell->cached_sp)
1576 << uint16 (spell->last_grace) 1581 << uint16 (spell->cached_grace)
1577 << uint16 (spell->last_eat) 1582 << uint16 (spell->cached_eat)
1578 << uint8 (skill) 1583 << uint8 (skill)
1579 << uint32 (spell->path_attuned) 1584 << uint32 (spell->path_attuned)
1580 << uint32 (spell->face) 1585 << uint32 (spell->face)
1581 << data8 (spell->name) 1586 << data8 (spell->name)
1582 << data16 (spell->msg); 1587 << data16 (spell->msg);

Diff Legend

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