… | |
… | |
522 | * commands. |
522 | * commands. |
523 | */ |
523 | */ |
524 | pl->count = 0; |
524 | pl->count = 0; |
525 | } |
525 | } |
526 | |
526 | |
527 | |
|
|
528 | /** |
527 | /** |
529 | * This handles the general commands from the client (ie, north, fire, cast, |
528 | * 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 |
529 | * 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 |
530 | * 'ncom' method which gives more information back to the client so it |
532 | * can throttle. |
531 | * can throttle. |
… | |
… | |
738 | buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; |
737 | buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; |
739 | |
738 | |
740 | if (pl->combat_ob) |
739 | if (pl->combat_ob) |
741 | buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; |
740 | buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; |
742 | |
741 | |
|
|
742 | #if 0 |
743 | //TODO: remove this when slot system is working, this is only for debugging |
743 | //TODO: remove this when slot system is working, this is only for debugging |
744 | if (pl->ob->chosen_skill) |
744 | if (pl->ob->chosen_skill) |
745 | buf << " Skill*: " << pl->ob->chosen_skill->name; |
745 | buf << " Skill*: " << pl->ob->chosen_skill->name; |
|
|
746 | #endif |
746 | |
747 | |
747 | //TODO: maybe golem should become the current_weapon, quite simply? |
748 | //TODO: maybe golem should become the current_weapon, quite simply? |
748 | if (pl->golem) |
749 | if (pl->golem) |
749 | buf << " Golem*: " << pl->golem->name; |
750 | buf << " Golem*: " << pl->golem->name; |
750 | |
751 | |
|
|
752 | buf << '\0'; |
751 | buf.linearise (obuf); |
753 | buf.linearise (obuf); |
752 | obuf [buf.size ()] = 0; |
|
|
753 | } |
754 | } |
754 | |
755 | |
755 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
756 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
756 | Old = New; \ |
757 | Old = New; \ |
757 | sl << uint8 (Type) << uint64 (New); \ |
758 | sl << uint8 (Type) << uint64 (New); \ |
… | |
… | |
794 | return; |
795 | return; |
795 | |
796 | |
796 | object *ob = pl->observe; |
797 | object *ob = pl->observe; |
797 | if (!ob) |
798 | if (!ob) |
798 | return; |
799 | return; |
|
|
800 | |
|
|
801 | player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl; |
799 | |
802 | |
800 | packet sl ("stats"); |
803 | packet sl ("stats"); |
801 | |
804 | |
802 | AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); |
805 | AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); |
803 | AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); |
806 | AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); |
… | |
… | |
812 | AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); |
815 | AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); |
813 | AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); |
816 | AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); |
814 | AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); |
817 | AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); |
815 | |
818 | |
816 | for (int s = 0; s < NUM_SKILLS; s++) |
819 | for (int s = 0; s < NUM_SKILLS; s++) |
817 | if (object *skill = pl->last_skill_ob[s]) |
820 | if (object *skill = opl->last_skill_ob[s]) |
818 | if (skill->stats.exp != ns->last_skill_exp [s]) |
821 | if (skill->stats.exp != ns->last_skill_exp [s]) |
819 | { |
822 | { |
820 | ns->last_skill_exp [s] = skill->stats.exp; |
823 | ns->last_skill_exp [s] = skill->stats.exp; |
821 | |
824 | |
822 | /* Always send along the level if exp changes. This is only |
825 | /* 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); |
840 | 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); |
841 | AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); |
839 | |
842 | |
840 | flags = 0; |
843 | flags = 0; |
841 | |
844 | |
842 | if (pl->fire_on) |
845 | if (opl->fire_on) |
843 | flags |= SF_FIREON; |
846 | flags |= SF_FIREON; |
844 | |
847 | |
845 | if (pl->run_on) |
848 | if (opl->run_on) |
846 | flags |= SF_RUNON; |
849 | flags |= SF_RUNON; |
847 | |
850 | |
848 | AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); |
851 | AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); |
849 | |
852 | |
850 | if (ns->sc_version < 1025) |
853 | if (ns->sc_version < 1025) |
… | |
… | |
864 | AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
867 | 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); |
868 | 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); |
869 | AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); |
867 | } |
870 | } |
868 | |
871 | |
869 | rangetostring (pl, buf); /* we want use the new fire & run system in new client */ |
872 | rangetostring (opl, buf); /* we want use the new fire & run system in new client */ |
870 | AddIfString (ns->stats.range, buf, CS_STAT_RANGE); |
873 | AddIfString (ns->stats.range, buf, CS_STAT_RANGE); |
871 | set_title (ob, buf); |
874 | set_title (ob, buf); |
872 | AddIfString (ns->stats.title, buf, CS_STAT_TITLE); |
875 | AddIfString (ns->stats.title, buf, CS_STAT_TITLE); |
873 | |
876 | |
874 | /* Only send it away if we have some actual data */ |
877 | /* Only send it away if we have some actual data */ |
… | |
… | |
1027 | */ |
1030 | */ |
1028 | if (!plmap || plmap->in_memory != MAP_IN_MEMORY) |
1031 | if (!plmap || plmap->in_memory != MAP_IN_MEMORY) |
1029 | return; |
1032 | return; |
1030 | |
1033 | |
1031 | int x, y, ax, ay, startlen, max_x, max_y, oldlen; |
1034 | int x, y, ax, ay, startlen, max_x, max_y, oldlen; |
1032 | sint16 nx, ny; |
|
|
1033 | int estartlen, eoldlen; |
1035 | int estartlen, eoldlen; |
1034 | uint8 eentrysize; |
1036 | uint8 eentrysize; |
1035 | uint16 ewhatstart, ewhatflag; |
1037 | uint16 ewhatstart, ewhatflag; |
1036 | uint8 extendedinfos; |
1038 | uint8 extendedinfos; |
1037 | maptile *m; |
|
|
1038 | |
1039 | |
1039 | check_map_change (pl); |
1040 | check_map_change (pl); |
1040 | prefetch_surrounding_maps (pl->ob); |
1041 | prefetch_surrounding_maps (pl->ob); |
1041 | |
1042 | |
1042 | /* do LOS after calls to update_position */ |
1043 | /* do LOS after calls to update_position */ |
… | |
… | |
1108 | max_x = ob->x + (socket.mapx + 1) / 2; |
1109 | max_x = ob->x + (socket.mapx + 1) / 2; |
1109 | max_y = ob->y + (socket.mapy + 1) / 2; |
1110 | max_y = ob->y + (socket.mapy + 1) / 2; |
1110 | |
1111 | |
1111 | for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++) |
1112 | for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++) |
1112 | { |
1113 | { |
|
|
1114 | sint16 nx, ny; |
|
|
1115 | maptile *m = 0; |
|
|
1116 | |
1113 | ax = 0; |
1117 | ax = 0; |
1114 | for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) |
1118 | for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) |
1115 | { |
1119 | { |
|
|
1120 | // check to see if we can simply go one right quickly |
|
|
1121 | ++nx; |
|
|
1122 | if (m && nx >= m->width) |
|
|
1123 | m = 0; |
|
|
1124 | |
|
|
1125 | if (!m) |
|
|
1126 | { |
|
|
1127 | nx = x; ny = y; m = plmap; |
|
|
1128 | |
|
|
1129 | if (!xy_normalise (m, nx, ny)) |
|
|
1130 | m = 0; |
|
|
1131 | } |
|
|
1132 | |
1116 | int emask, mask; |
1133 | int emask, mask; |
1117 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1134 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1118 | |
1135 | |
1119 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1136 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1120 | |
1137 | |
1121 | /* If the coordinates are not valid, or it is too dark to see, |
1138 | /* If the coordinates are not valid, or it is too dark to see, |
1122 | * we tell the client as such |
1139 | * we tell the client as such |
1123 | */ |
1140 | */ |
1124 | nx = x; |
|
|
1125 | ny = y; |
|
|
1126 | m = get_map_from_coord (plmap, &nx, &ny); |
|
|
1127 | |
|
|
1128 | if (!m) |
1141 | if (!m) |
1129 | { |
1142 | { |
1130 | /* space is out of map. Update space and clear values |
1143 | /* space is out of map. Update space and clear values |
1131 | * if this hasn't already been done. If the space is out |
1144 | * if this hasn't already been done. If the space is out |
1132 | * of the map, it shouldn't have a head |
1145 | * of the map, it shouldn't have a head |
… | |
… | |
1213 | } |
1226 | } |
1214 | |
1227 | |
1215 | lastcell.count = d; |
1228 | lastcell.count = d; |
1216 | |
1229 | |
1217 | mapspace &ms = m->at (nx, ny); |
1230 | mapspace &ms = m->at (nx, ny); |
|
|
1231 | ms.update (); |
1218 | |
1232 | |
1219 | if (socket.extmap) |
1233 | if (socket.extmap) |
1220 | { |
1234 | { |
1221 | uint8 stat_hp = 0; |
1235 | uint8 stat_hp = 0; |
1222 | uint8 stat_width = 0; |
1236 | uint8 stat_width = 0; |
… | |
… | |
1232 | || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) |
1246 | || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) |
1233 | { |
1247 | { |
1234 | if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) |
1248 | if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) |
1235 | { |
1249 | { |
1236 | stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; |
1250 | stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; |
1237 | stat_width = op->arch->tail_x; |
1251 | stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge |
1238 | } |
1252 | } |
1239 | } |
1253 | } |
1240 | |
1254 | |
1241 | if (op->msg && op->msg[0] == '@') |
1255 | if (op->msg && op->msg[0] == '@') |
1242 | flags |= 1; |
1256 | flags |= 1; |