… | |
… | |
148 | { |
148 | { |
149 | client &socket = *pl->ns; |
149 | client &socket = *pl->ns; |
150 | object *ob = pl->ob; |
150 | object *ob = pl->ob; |
151 | char buf[MAX_BUF]; /* eauugggh */ |
151 | char buf[MAX_BUF]; /* eauugggh */ |
152 | |
152 | |
153 | if (socket.force_newmap) |
153 | if (socket.current_map != ob->map || socket.force_newmap) |
154 | { |
|
|
155 | // force newmap is used for clients that do not redraw their map |
|
|
156 | // after image uploads. |
|
|
157 | socket.current_map = ob->map; |
|
|
158 | clear_map (pl); |
|
|
159 | } |
|
|
160 | else if (socket.current_map != ob->map) |
|
|
161 | { |
154 | { |
162 | clear_map (pl); |
155 | clear_map (pl); |
163 | socket.current_map = ob->map; |
156 | socket.current_map = ob->map; |
164 | |
157 | |
165 | if (socket.mapinfocmd) |
158 | if (socket.mapinfocmd) |
166 | { |
159 | { |
167 | if (ob->map && ob->map->path[0]) |
160 | if (ob->map && ob->map->path[0]) |
168 | { |
161 | { |
169 | int flags = 0; |
162 | int flags = 0; |
170 | |
163 | |
171 | if (ob->map->tile_path[0]) |
164 | if (ob->map->tile_path[0]) flags |= 1; |
172 | flags |= 1; |
|
|
173 | if (ob->map->tile_path[1]) |
165 | if (ob->map->tile_path[1]) flags |= 2; |
174 | flags |= 2; |
|
|
175 | if (ob->map->tile_path[2]) |
166 | if (ob->map->tile_path[2]) flags |= 4; |
176 | flags |= 4; |
|
|
177 | if (ob->map->tile_path[3]) |
167 | if (ob->map->tile_path[3]) flags |= 8; |
178 | flags |= 8; |
|
|
179 | |
168 | |
180 | snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", |
169 | snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", |
181 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path); |
170 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path); |
182 | } |
171 | } |
183 | else |
172 | else |
… | |
… | |
332 | snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token); |
321 | snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token); |
333 | else if (map && map->path[0]) |
322 | else if (map && map->path[0]) |
334 | { |
323 | { |
335 | int flags = 0; |
324 | int flags = 0; |
336 | |
325 | |
337 | if (map->tile_path[0]) |
326 | if (map->tile_path[0]) flags |= 1; |
338 | flags |= 1; |
|
|
339 | if (map->tile_path[1]) |
327 | if (map->tile_path[1]) flags |= 2; |
340 | flags |= 2; |
|
|
341 | if (map->tile_path[2]) |
328 | if (map->tile_path[2]) flags |= 4; |
342 | flags |= 4; |
|
|
343 | if (map->tile_path[3]) |
329 | if (map->tile_path[3]) flags |= 8; |
344 | flags |= 8; |
|
|
345 | |
330 | |
346 | snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); |
331 | snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); |
347 | } |
332 | } |
348 | else |
333 | else |
349 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
334 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
… | |
… | |
505 | */ |
490 | */ |
506 | void |
491 | void |
507 | AskSmooth (char *buf, int len, client *ns) |
492 | AskSmooth (char *buf, int len, client *ns) |
508 | { |
493 | { |
509 | ns->send_face (atoi (buf)); |
494 | ns->send_face (atoi (buf)); |
|
|
495 | ns->flush_fx (); |
510 | } |
496 | } |
511 | |
497 | |
512 | /** |
498 | /** |
513 | * This handles the general commands from the client (ie, north, fire, cast, |
499 | * This handles the general commands from the client (ie, north, fire, cast, |
514 | * etc.) |
500 | * etc.) |
… | |
… | |
617 | { |
603 | { |
618 | case ST_PLAYING: |
604 | case ST_PLAYING: |
619 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
605 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
620 | break; |
606 | break; |
621 | |
607 | |
622 | case ST_CHANGE_CLASS: |
|
|
623 | key_change_class (pl->ob, buf[0]); |
|
|
624 | break; |
|
|
625 | |
|
|
626 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
608 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
627 | receive_party_password (pl->ob, 13); |
609 | receive_party_password (pl->ob, 13); |
628 | break; |
610 | break; |
629 | |
611 | |
630 | default: |
612 | default: |
… | |
… | |
669 | |
651 | |
670 | cp = strchr (cp + 1, ' '); |
652 | cp = strchr (cp + 1, ' '); |
671 | |
653 | |
672 | if (cp) |
654 | if (cp) |
673 | { |
655 | { |
674 | assign (ns->version, cp + 1); |
656 | ns->version = cp + 1; |
675 | |
657 | |
676 | if (ns->sc_version < 1026) |
658 | if (ns->sc_version < 1026) |
677 | ns->send_packet_printf ("drawinfo %d %s", NDI_RED, |
659 | ns->send_packet_printf ("drawinfo %d %s", NDI_RED, |
678 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
660 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
679 | } |
661 | } |
… | |
… | |
742 | */ |
724 | */ |
743 | void |
725 | void |
744 | send_query (client *ns, uint8 flags, const char *text) |
726 | send_query (client *ns, uint8 flags, const char *text) |
745 | { |
727 | { |
746 | ns->send_packet_printf ("query %d %s", flags, text ? text : ""); |
728 | ns->send_packet_printf ("query %d %s", flags, text ? text : ""); |
|
|
729 | } |
|
|
730 | |
|
|
731 | /** |
|
|
732 | * Get player's current range attack in obuf. |
|
|
733 | */ |
|
|
734 | static void |
|
|
735 | rangetostring (player *pl, char *obuf) |
|
|
736 | { |
|
|
737 | dynbuf_text buf; |
|
|
738 | |
|
|
739 | if (pl->ranged_ob) |
|
|
740 | buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; |
|
|
741 | |
|
|
742 | if (pl->combat_ob) |
|
|
743 | buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; |
|
|
744 | |
|
|
745 | //TODO: maybe golem should become the current_weapon, quite simply? |
|
|
746 | if (pl->golem) |
|
|
747 | buf << " Golem*: " << pl->golem->name; |
|
|
748 | |
|
|
749 | buf.linearise (obuf); |
|
|
750 | obuf [buf.size ()] = 0; |
747 | } |
751 | } |
748 | |
752 | |
749 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
753 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
750 | Old = New; \ |
754 | Old = New; \ |
751 | sl << uint8 (Type) << uint64 (New); \ |
755 | sl << uint8 (Type) << uint64 (New); \ |
… | |
… | |
858 | AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
862 | AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
859 | AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); |
863 | AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); |
860 | AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); |
864 | AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); |
861 | } |
865 | } |
862 | |
866 | |
863 | rangetostring (ob, buf); /* we want use the new fire & run system in new client */ |
867 | rangetostring (pl, buf); /* we want use the new fire & run system in new client */ |
864 | AddIfString (ns->stats.range, buf, CS_STAT_RANGE); |
868 | AddIfString (ns->stats.range, buf, CS_STAT_RANGE); |
865 | set_title (ob, buf); |
869 | set_title (ob, buf); |
866 | AddIfString (ns->stats.title, buf, CS_STAT_TITLE); |
870 | AddIfString (ns->stats.title, buf, CS_STAT_TITLE); |
867 | |
871 | |
868 | /* Only send it away if we have some actual data */ |
872 | /* Only send it away if we have some actual data */ |
… | |
… | |
1189 | |
1193 | |
1190 | mapspace &ms = m->at (nx, ny); |
1194 | mapspace &ms = m->at (nx, ny); |
1191 | |
1195 | |
1192 | if (socket.extmap) |
1196 | if (socket.extmap) |
1193 | { |
1197 | { |
1194 | uint8 stat_hp = 0; |
1198 | uint8 stat_hp = 0; |
1195 | uint8 stat_width = 0; |
1199 | uint8 stat_width = 0; |
1196 | uint8 flags = 0; |
1200 | uint8 flags = 0; |
1197 | UUID player = 0; |
1201 | tag_t player = 0; |
1198 | |
1202 | |
1199 | // send hp information, if applicable |
1203 | // send hp information, if applicable |
1200 | if (object *op = ms.faces_obj [0]) |
1204 | if (object *op = ms.faces_obj [0]) |
1201 | { |
1205 | { |
1202 | if (op->head || op->invisible) |
1206 | if (op->head || op->invisible) |
… | |
… | |
1243 | |
1247 | |
1244 | mask |= 0x8; |
1248 | mask |= 0x8; |
1245 | *last_ext |= 0x80; |
1249 | *last_ext |= 0x80; |
1246 | last_ext = &sl[sl.length ()]; |
1250 | last_ext = &sl[sl.length ()]; |
1247 | |
1251 | |
1248 | sl << uint8 (0x47) << uint8 (8) << (uint64)player; |
1252 | sl << uint8 (0x47) << uint8 (4) << (uint32)player; |
1249 | } |
1253 | } |
1250 | |
1254 | |
1251 | if (lastcell.flags != flags) |
1255 | if (lastcell.flags != flags) |
1252 | { |
1256 | { |
1253 | lastcell.flags = flags; |
1257 | lastcell.flags = flags; |
… | |
… | |
1326 | esl.reset (eoldlen); |
1330 | esl.reset (eoldlen); |
1327 | } |
1331 | } |
1328 | } /* else this is a viewable space */ |
1332 | } /* else this is a viewable space */ |
1329 | } /* for x loop */ |
1333 | } /* for x loop */ |
1330 | } /* for y loop */ |
1334 | } /* for y loop */ |
|
|
1335 | |
|
|
1336 | socket.flush_fx (); |
1331 | |
1337 | |
1332 | /* Verify that we in fact do need to send this */ |
1338 | /* Verify that we in fact do need to send this */ |
1333 | if (socket.ext_mapinfos) |
1339 | if (socket.ext_mapinfos) |
1334 | { |
1340 | { |
1335 | if (!(sl.length () > startlen || socket.sent_scroll)) |
1341 | if (!(sl.length () > startlen || socket.sent_scroll)) |