… | |
… | |
576 | * commands. |
576 | * commands. |
577 | */ |
577 | */ |
578 | pl->count = 0; |
578 | pl->count = 0; |
579 | |
579 | |
580 | //TODO: schmorp thinks whatever this calculates, it makes no sense at all |
580 | //TODO: schmorp thinks whatever this calculates, it makes no sense at all |
581 | int time = fabs (pl->ob->speed) < 0.001 |
581 | int time = pl->ob->has_active_speed () |
582 | ? time = MAX_TIME * 100 |
|
|
583 | : time = (int) (MAX_TIME / fabs (pl->ob->speed)); |
582 | ? (int) (MAX_TIME / pl->ob->speed) |
|
|
583 | : MAX_TIME * 100; |
584 | |
584 | |
585 | /* Send confirmation of command execution now */ |
585 | /* Send confirmation of command execution now */ |
586 | packet sl ("comc"); |
586 | packet sl ("comc"); |
587 | sl << uint16 (cmdid) << uint32 (time); |
587 | sl << uint16 (cmdid) << uint32 (time); |
588 | pl->ns->send_packet (sl); |
588 | pl->ns->send_packet (sl); |
… | |
… | |
838 | AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); |
838 | AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); |
839 | AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); |
839 | AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); |
840 | AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); |
840 | AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); |
841 | AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); |
841 | AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); |
842 | AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); |
842 | AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); |
843 | AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK); |
843 | AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK); |
844 | AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); |
844 | AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); |
845 | AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); |
845 | AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK); |
846 | AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); |
846 | AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); |
847 | |
847 | |
848 | flags = 0; |
848 | flags = 0; |
849 | |
849 | |
850 | if (opl->fire_on) |
850 | if (opl->fire_on) |
… | |
… | |
853 | if (opl->run_on) |
853 | if (opl->run_on) |
854 | flags |= SF_RUNON; |
854 | flags |= SF_RUNON; |
855 | |
855 | |
856 | AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); |
856 | AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); |
857 | |
857 | |
858 | if (ns->sc_version < 1025) |
|
|
859 | { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
|
|
860 | else |
|
|
861 | for (int i = 0; i < NROFATTACKS; i++) |
858 | for (int i = 0; i < NROFATTACKS; i++) |
862 | { |
859 | { |
863 | /* Skip ones we won't send */ |
860 | /* Skip ones we won't send */ |
864 | if (atnr_cs_stat[i] == -1) |
861 | if (atnr_cs_stat[i] == -1) |
865 | continue; |
862 | continue; |
866 | |
863 | |
867 | AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); |
864 | AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); |
868 | } |
865 | } |
869 | |
866 | |
870 | if (pl->ns->monitor_spells) |
867 | if (pl->ns->monitor_spells) |
871 | { |
868 | { |
872 | AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
869 | AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
873 | AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); |
870 | AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); |
… | |
… | |
984 | prefetch_surrounding_maps (maptile *map, int distance) |
981 | prefetch_surrounding_maps (maptile *map, int distance) |
985 | { |
982 | { |
986 | map->touch (); |
983 | map->touch (); |
987 | |
984 | |
988 | if (--distance) |
985 | if (--distance) |
989 | for (int dir = 4; --dir; ) |
986 | for (int dir = 4; dir--; ) |
990 | if (const shstr &path = map->tile_path [dir]) |
987 | if (const shstr &path = map->tile_path [dir]) |
991 | if (maptile *&neigh = map->tile_map [dir]) |
988 | if (maptile *&neigh = map->tile_map [dir]) |
992 | prefetch_surrounding_maps (neigh, distance); |
989 | prefetch_surrounding_maps (neigh, distance); |
993 | else |
990 | else |
994 | neigh = maptile::find_async (path, map); |
991 | neigh = maptile::find_async (path, map); |
… | |
… | |
1087 | map_clearcell (&lastcell, -1); |
1084 | map_clearcell (&lastcell, -1); |
1088 | } |
1085 | } |
1089 | |
1086 | |
1090 | continue; |
1087 | continue; |
1091 | } |
1088 | } |
1092 | |
1089 | |
1093 | int d = pl->blocked_los_uc (dx, dy); |
1090 | int d = pl->blocked_los_uc (dx, dy); |
1094 | |
1091 | |
1095 | if (d > 3) |
1092 | if (d > 3) |
1096 | { |
1093 | { |
1097 | /* This block deals with spaces that are not visible for whatever |
1094 | /* This block deals with spaces that are not visible for whatever |
… | |
… | |
1276 | esrv_update_spells (player *pl) |
1273 | esrv_update_spells (player *pl) |
1277 | { |
1274 | { |
1278 | if (!pl->ns) |
1275 | if (!pl->ns) |
1279 | return; |
1276 | return; |
1280 | |
1277 | |
|
|
1278 | pl->ns->update_spells = false; |
|
|
1279 | |
1281 | if (!pl->ns->monitor_spells) |
1280 | if (!pl->ns->monitor_spells) |
1282 | return; |
1281 | return; |
1283 | |
1282 | |
1284 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
1283 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
1285 | { |
1284 | { |