… | |
… | |
471 | |
471 | |
472 | ns->send_packet (cmdback); |
472 | ns->send_packet (cmdback); |
473 | } |
473 | } |
474 | |
474 | |
475 | /** |
475 | /** |
476 | * client requested an image. send it rate-limited |
|
|
477 | * before flushing. |
|
|
478 | */ |
|
|
479 | void |
|
|
480 | AskFaceCmd (char *buf, int len, client *ns) |
|
|
481 | { |
|
|
482 | ns->askface.push_back (atoi (buf)); |
|
|
483 | } |
|
|
484 | |
|
|
485 | /** |
|
|
486 | * Tells client the picture it has to use |
|
|
487 | * to smooth a picture number given as argument. |
|
|
488 | */ |
|
|
489 | void |
|
|
490 | AskSmooth (char *buf, int len, client *ns) |
|
|
491 | { |
|
|
492 | ns->send_face (atoi (buf)); |
|
|
493 | ns->flush_fx (); |
|
|
494 | } |
|
|
495 | |
|
|
496 | /** |
|
|
497 | * This handles the general commands from the client (ie, north, fire, cast, |
476 | * This handles the general commands from the client (ie, north, fire, cast, |
498 | * etc.) |
477 | * etc.) |
499 | */ |
478 | */ |
500 | void |
479 | void |
501 | PlayerCmd (char *buf, int len, player *pl) |
480 | PlayerCmd (char *buf, int len, player *pl) |
… | |
… | |
521 | * for the command that issued the count should be done before any other |
500 | * for the command that issued the count should be done before any other |
522 | * commands. |
501 | * commands. |
523 | */ |
502 | */ |
524 | pl->count = 0; |
503 | pl->count = 0; |
525 | } |
504 | } |
526 | |
|
|
527 | |
505 | |
528 | /** |
506 | /** |
529 | * This handles the general commands from the client (ie, north, fire, cast, |
507 | * This handles the general commands from the client (ie, north, fire, cast, |
530 | * etc.). It is a lot like PlayerCmd above, but is called with the |
508 | * etc.). It is a lot like PlayerCmd above, but is called with the |
531 | * 'ncom' method which gives more information back to the client so it |
509 | * 'ncom' method which gives more information back to the client so it |
… | |
… | |
738 | buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; |
716 | buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; |
739 | |
717 | |
740 | if (pl->combat_ob) |
718 | if (pl->combat_ob) |
741 | buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; |
719 | buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; |
742 | |
720 | |
|
|
721 | #if 0 |
743 | //TODO: remove this when slot system is working, this is only for debugging |
722 | //TODO: remove this when slot system is working, this is only for debugging |
744 | if (pl->ob->chosen_skill) |
723 | if (pl->ob->chosen_skill) |
745 | buf << " Skill*: " << pl->ob->chosen_skill->name; |
724 | buf << " Skill*: " << pl->ob->chosen_skill->name; |
|
|
725 | #endif |
746 | |
726 | |
747 | //TODO: maybe golem should become the current_weapon, quite simply? |
727 | //TODO: maybe golem should become the current_weapon, quite simply? |
748 | if (pl->golem) |
728 | if (pl->golem) |
749 | buf << " Golem*: " << pl->golem->name; |
729 | buf << " Golem*: " << pl->golem->name; |
750 | |
730 | |
|
|
731 | buf << '\0'; |
751 | buf.linearise (obuf); |
732 | buf.linearise (obuf); |
752 | obuf [buf.size ()] = 0; |
|
|
753 | } |
733 | } |
754 | |
734 | |
755 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
735 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
756 | Old = New; \ |
736 | Old = New; \ |
757 | sl << uint8 (Type) << uint64 (New); \ |
737 | sl << uint8 (Type) << uint64 (New); \ |
… | |
… | |
794 | return; |
774 | return; |
795 | |
775 | |
796 | object *ob = pl->observe; |
776 | object *ob = pl->observe; |
797 | if (!ob) |
777 | if (!ob) |
798 | return; |
778 | return; |
|
|
779 | |
|
|
780 | player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl; |
799 | |
781 | |
800 | packet sl ("stats"); |
782 | packet sl ("stats"); |
801 | |
783 | |
802 | AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); |
784 | AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); |
803 | AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); |
785 | AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); |
… | |
… | |
812 | AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); |
794 | AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); |
813 | AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); |
795 | AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); |
814 | AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); |
796 | AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); |
815 | |
797 | |
816 | for (int s = 0; s < NUM_SKILLS; s++) |
798 | for (int s = 0; s < NUM_SKILLS; s++) |
817 | if (object *skill = pl->last_skill_ob[s]) |
799 | if (object *skill = opl->last_skill_ob[s]) |
818 | if (skill->stats.exp != ns->last_skill_exp [s]) |
800 | if (skill->stats.exp != ns->last_skill_exp [s]) |
819 | { |
801 | { |
820 | ns->last_skill_exp [s] = skill->stats.exp; |
802 | ns->last_skill_exp [s] = skill->stats.exp; |
821 | |
803 | |
822 | /* Always send along the level if exp changes. This is only |
804 | /* Always send along the level if exp changes. This is only |
… | |
… | |
837 | AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); |
819 | AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); |
838 | AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); |
820 | AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); |
839 | |
821 | |
840 | flags = 0; |
822 | flags = 0; |
841 | |
823 | |
842 | if (pl->fire_on) |
824 | if (opl->fire_on) |
843 | flags |= SF_FIREON; |
825 | flags |= SF_FIREON; |
844 | |
826 | |
845 | if (pl->run_on) |
827 | if (opl->run_on) |
846 | flags |= SF_RUNON; |
828 | flags |= SF_RUNON; |
847 | |
829 | |
848 | AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); |
830 | AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); |
849 | |
831 | |
850 | if (ns->sc_version < 1025) |
832 | if (ns->sc_version < 1025) |
… | |
… | |
864 | AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
846 | AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
865 | AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); |
847 | AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); |
866 | AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); |
848 | AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); |
867 | } |
849 | } |
868 | |
850 | |
869 | rangetostring (pl, buf); /* we want use the new fire & run system in new client */ |
851 | rangetostring (opl, buf); /* we want use the new fire & run system in new client */ |
870 | AddIfString (ns->stats.range, buf, CS_STAT_RANGE); |
852 | AddIfString (ns->stats.range, buf, CS_STAT_RANGE); |
871 | set_title (ob, buf); |
853 | set_title (ob, buf); |
872 | AddIfString (ns->stats.title, buf, CS_STAT_TITLE); |
854 | AddIfString (ns->stats.title, buf, CS_STAT_TITLE); |
873 | |
855 | |
874 | /* Only send it away if we have some actual data */ |
856 | /* Only send it away if we have some actual data */ |
… | |
… | |
1027 | */ |
1009 | */ |
1028 | if (!plmap || plmap->in_memory != MAP_IN_MEMORY) |
1010 | if (!plmap || plmap->in_memory != MAP_IN_MEMORY) |
1029 | return; |
1011 | return; |
1030 | |
1012 | |
1031 | int x, y, ax, ay, startlen, max_x, max_y, oldlen; |
1013 | int x, y, ax, ay, startlen, max_x, max_y, oldlen; |
1032 | sint16 nx, ny; |
|
|
1033 | int estartlen, eoldlen; |
1014 | int estartlen, eoldlen; |
1034 | uint8 eentrysize; |
1015 | uint8 eentrysize; |
1035 | uint16 ewhatstart, ewhatflag; |
1016 | uint16 ewhatstart, ewhatflag; |
1036 | uint8 extendedinfos; |
1017 | uint8 extendedinfos; |
1037 | maptile *m; |
|
|
1038 | |
1018 | |
1039 | check_map_change (pl); |
1019 | check_map_change (pl); |
1040 | prefetch_surrounding_maps (pl->ob); |
1020 | prefetch_surrounding_maps (pl->ob); |
1041 | |
1021 | |
1042 | /* do LOS after calls to update_position */ |
1022 | /* do LOS after calls to update_position */ |
… | |
… | |
1108 | max_x = ob->x + (socket.mapx + 1) / 2; |
1088 | max_x = ob->x + (socket.mapx + 1) / 2; |
1109 | max_y = ob->y + (socket.mapy + 1) / 2; |
1089 | max_y = ob->y + (socket.mapy + 1) / 2; |
1110 | |
1090 | |
1111 | for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++) |
1091 | for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++) |
1112 | { |
1092 | { |
|
|
1093 | sint16 nx, ny; |
|
|
1094 | maptile *m = 0; |
|
|
1095 | |
1113 | ax = 0; |
1096 | ax = 0; |
1114 | for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) |
1097 | for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) |
1115 | { |
1098 | { |
|
|
1099 | // check to see if we can simply go one right quickly |
|
|
1100 | ++nx; |
|
|
1101 | if (m && nx >= m->width) |
|
|
1102 | m = 0; |
|
|
1103 | |
|
|
1104 | if (!m) |
|
|
1105 | { |
|
|
1106 | nx = x; ny = y; m = plmap; |
|
|
1107 | |
|
|
1108 | if (!xy_normalise (m, nx, ny)) |
|
|
1109 | m = 0; |
|
|
1110 | } |
|
|
1111 | |
1116 | int emask, mask; |
1112 | int emask, mask; |
1117 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1113 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1118 | |
1114 | |
1119 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1115 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1120 | |
1116 | |
1121 | /* If the coordinates are not valid, or it is too dark to see, |
1117 | /* If the coordinates are not valid, or it is too dark to see, |
1122 | * we tell the client as such |
1118 | * we tell the client as such |
1123 | */ |
1119 | */ |
1124 | nx = x; |
|
|
1125 | ny = y; |
|
|
1126 | m = get_map_from_coord (plmap, &nx, &ny); |
|
|
1127 | |
|
|
1128 | if (!m) |
1120 | if (!m) |
1129 | { |
1121 | { |
1130 | /* space is out of map. Update space and clear values |
1122 | /* space is out of map. Update space and clear values |
1131 | * if this hasn't already been done. If the space is out |
1123 | * if this hasn't already been done. If the space is out |
1132 | * of the map, it shouldn't have a head |
1124 | * of the map, it shouldn't have a head |
… | |
… | |
1213 | } |
1205 | } |
1214 | |
1206 | |
1215 | lastcell.count = d; |
1207 | lastcell.count = d; |
1216 | |
1208 | |
1217 | mapspace &ms = m->at (nx, ny); |
1209 | mapspace &ms = m->at (nx, ny); |
|
|
1210 | ms.update (); |
1218 | |
1211 | |
1219 | if (socket.extmap) |
1212 | if (socket.extmap) |
1220 | { |
1213 | { |
1221 | uint8 stat_hp = 0; |
1214 | uint8 stat_hp = 0; |
1222 | uint8 stat_width = 0; |
1215 | uint8 stat_width = 0; |
… | |
… | |
1232 | || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) |
1225 | || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) |
1233 | { |
1226 | { |
1234 | if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) |
1227 | if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) |
1235 | { |
1228 | { |
1236 | stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; |
1229 | stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; |
1237 | stat_width = op->arch->tail_x; |
1230 | stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge |
1238 | } |
1231 | } |
1239 | } |
1232 | } |
1240 | |
1233 | |
1241 | if (op->msg && op->msg[0] == '@') |
1234 | if (op->msg && op->msg[0] == '@') |
1242 | flags |= 1; |
1235 | flags |= 1; |