… | |
… | |
124 | continue; |
124 | continue; |
125 | |
125 | |
126 | if (*buf == '%') |
126 | if (*buf == '%') |
127 | { /* send one news */ |
127 | { /* send one news */ |
128 | if (size > 0) |
128 | if (size > 0) |
129 | draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", "%s\n%s", subject, news); /*send previously read news */ |
129 | draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char *)"%s\n%s", subject, news); /*send previously read news */ |
130 | |
130 | |
131 | strcpy (subject, buf + 1); |
131 | strcpy (subject, buf + 1); |
132 | strip_endline (subject); |
132 | strip_endline (subject); |
133 | size = 0; |
133 | size = 0; |
134 | news[0] = '\0'; |
134 | news[0] = '\0'; |
… | |
… | |
144 | size += strlen (buf); |
144 | size += strlen (buf); |
145 | } |
145 | } |
146 | } |
146 | } |
147 | |
147 | |
148 | draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, |
148 | draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, |
149 | MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news); |
149 | MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news); |
150 | close_and_delete (fp, comp); |
150 | close_and_delete (fp, comp); |
151 | } |
151 | } |
152 | |
152 | |
153 | /* This loads the first map an puts the player on it. */ |
153 | /* This loads the first map an puts the player on it. */ |
154 | static void |
154 | static void |
… | |
… | |
194 | return; |
194 | return; |
195 | |
195 | |
196 | terminate_all_pets (ob); |
196 | terminate_all_pets (ob); |
197 | remove_friendly_object (ob); |
197 | remove_friendly_object (ob); |
198 | ob->deactivate_recursive (); |
198 | ob->deactivate_recursive (); |
|
|
199 | |
|
|
200 | if (ob->map) |
199 | maplevel = ob->map->path; |
201 | maplevel = ob->map->path; |
|
|
202 | |
200 | ob->remove (); |
203 | ob->remove (); |
201 | ob->map = 0; |
204 | ob->map = 0; |
202 | party = 0; |
205 | party = 0; |
203 | |
206 | |
204 | // for weird reasons, this is often "ob", keeping a circular reference |
207 | // for weird reasons, this is often "ob", keeping a circular reference |
… | |
… | |
228 | |
231 | |
229 | /* make sure he's a player -- needed because of class change. */ |
232 | /* make sure he's a player -- needed because of class change. */ |
230 | ob->type = PLAYER; // we are paranoid |
233 | ob->type = PLAYER; // we are paranoid |
231 | ob->race = ob->arch->clone.race; |
234 | ob->race = ob->arch->clone.race; |
232 | |
235 | |
233 | if (!legal_range (ob, shoottype)) |
236 | if (!legal_range (shoottype)) |
234 | shoottype = range_none; |
237 | shoottype = range_none; |
235 | |
238 | |
236 | ob->carrying = sum_weight (ob); |
239 | ob->carrying = sum_weight (ob); |
237 | link_player_skills (ob); |
240 | link_player_skills (ob); |
238 | |
241 | |
… | |
… | |
288 | |
291 | |
289 | INVOKE_PLAYER (DISCONNECT, this); |
292 | INVOKE_PLAYER (DISCONNECT, this); |
290 | |
293 | |
291 | ns->reset_stats (); |
294 | ns->reset_stats (); |
292 | ns->pl = 0; |
295 | ns->pl = 0; |
293 | this->ns = 0; |
296 | ns = 0; |
294 | } |
297 | } |
295 | |
298 | |
296 | if (ob) |
299 | if (ob) |
297 | ob->close_container (); //TODO: client-specific |
300 | ob->close_container (); //TODO: client-specific |
298 | |
301 | |
… | |
… | |
315 | player::player () |
318 | player::player () |
316 | { |
319 | { |
317 | /* There are some elements we want initialised to non zero value - |
320 | /* There are some elements we want initialised to non zero value - |
318 | * we deal with that below this point. |
321 | * we deal with that below this point. |
319 | */ |
322 | */ |
320 | outputs_sync = 16; /* Every 2 seconds */ |
323 | outputs_sync = 4; |
321 | outputs_count = 8; /* Keeps present behaviour */ |
324 | outputs_count = 4; |
322 | unapply = unapply_nochoice; |
325 | unapply = unapply_nochoice; |
323 | |
326 | |
324 | savebed_map = first_map_path; /* Init. respawn position */ |
327 | savebed_map = first_map_path; /* Init. respawn position */ |
325 | |
328 | |
326 | gen_sp_armour = 10; |
329 | gen_sp_armour = 10; |
… | |
… | |
865 | * appropriate action with it (change race, or other things). |
868 | * appropriate action with it (change race, or other things). |
866 | * The function name is for historical reasons - now we have |
869 | * The function name is for historical reasons - now we have |
867 | * separate race and class; this actually changes the RACE, |
870 | * separate race and class; this actually changes the RACE, |
868 | * not the class. |
871 | * not the class. |
869 | */ |
872 | */ |
870 | int |
873 | void |
871 | key_change_class (object *op, char key) |
874 | player::chargen_race_done () |
872 | { |
875 | { |
873 | int tmp_loop; |
|
|
874 | |
|
|
875 | if (key == 'd' || key == 'D') |
|
|
876 | { |
|
|
877 | char buf[MAX_BUF]; |
|
|
878 | |
|
|
879 | /* this must before then initial items are given */ |
876 | /* this must before then initial items are given */ |
880 | esrv_new_player (op->contr, op->weight + op->carrying); |
877 | esrv_new_player (ob->contr, ob->weight + ob->carrying); |
881 | |
878 | |
882 | treasurelist *tl = find_treasurelist ("starting_wealth"); |
879 | treasurelist *tl = treasurelist::find ("starting_wealth"); |
883 | if (tl) |
880 | if (tl) |
884 | create_treasure (tl, op, 0, 0, 0); |
881 | create_treasure (tl, ob, 0, 0, 0); |
885 | |
882 | |
886 | INVOKE_PLAYER (BIRTH, op->contr); |
883 | INVOKE_PLAYER (BIRTH, ob->contr); |
887 | INVOKE_PLAYER (LOGIN, op->contr); |
884 | INVOKE_PLAYER (LOGIN, ob->contr); |
888 | |
885 | |
889 | op->contr->ns->state = ST_PLAYING; |
886 | ob->contr->ns->state = ST_PLAYING; |
890 | |
887 | |
891 | if (op->msg) |
888 | if (ob->msg) |
892 | op->msg = NULL; |
889 | ob->msg = 0; |
893 | |
890 | |
894 | /* We create this now because some of the unique maps will need it |
891 | /* We create this now because some of the unique maps will need it |
895 | * to save here. |
892 | * to save here. |
896 | */ |
893 | */ |
|
|
894 | { |
|
|
895 | char buf[MAX_BUF]; |
897 | sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); |
896 | sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name); |
898 | make_path_to_file (buf); |
897 | make_path_to_file (buf); |
|
|
898 | } |
899 | |
899 | |
900 | start_info (op); |
900 | start_info (ob); |
901 | CLEAR_FLAG (op, FLAG_WIZ); |
901 | CLEAR_FLAG (ob, FLAG_WIZ); |
902 | give_initial_items (op, op->randomitems); |
902 | give_initial_items (ob, ob->randomitems); |
903 | link_player_skills (op); |
903 | link_player_skills (ob); |
904 | esrv_send_inventory (op, op); |
904 | esrv_send_inventory (ob, ob); |
905 | op->update_stats (); |
905 | ob->update_stats (); |
906 | |
906 | |
907 | /* This moves the player to a different start map, if there |
907 | /* This moves the player to a different start map, if there |
908 | * is one for this race |
908 | * is one for this race |
909 | */ |
909 | */ |
910 | if (*first_map_ext_path) |
910 | if (*first_map_ext_path) |
911 | { |
911 | { |
912 | object *tmp; |
912 | object *tmp; |
913 | char mapname[MAX_BUF]; |
913 | char mapname[MAX_BUF]; |
914 | |
914 | |
915 | snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name); |
915 | snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name); |
916 | tmp = object::create (); |
916 | tmp = object::create (); |
917 | EXIT_PATH (tmp) = mapname; |
917 | EXIT_PATH (tmp) = mapname; |
918 | EXIT_X (tmp) = op->x; |
918 | EXIT_X (tmp) = ob->x; |
919 | EXIT_Y (tmp) = op->y; |
919 | EXIT_Y (tmp) = ob->y; |
920 | op->enter_exit (tmp); /* we don't really care if it succeeded; |
920 | ob->enter_exit (tmp); /* we don't really care if it succeeded; |
921 | * if the map isn't there, then stay on the |
921 | * if the map isn't there, then stay on the |
922 | * default initial map */ |
922 | * default initial map */ |
923 | tmp->destroy (); |
923 | tmp->destroy (); |
924 | } |
924 | } |
925 | else |
925 | else |
926 | LOG (llevDebug, "first_map_ext_path not set\n"); |
926 | LOG (llevDebug, "first_map_ext_path not set\n"); |
|
|
927 | } |
927 | |
928 | |
928 | return 0; |
929 | void |
929 | } |
930 | player::chargen_race_next () |
930 | |
931 | { |
931 | /* Following actually changes the race - this is the default command |
932 | /* Following actually changes the race - this is the default command |
932 | * if we don't match with one of the options above. |
933 | * if we don't match with one of the options above. |
933 | */ |
934 | */ |
934 | |
935 | |
935 | tmp_loop = 0; |
936 | do |
936 | while (!tmp_loop) |
|
|
937 | { |
937 | { |
938 | shstr name = op->name; |
938 | shstr name = ob->name; |
939 | int x = op->x, y = op->y; |
939 | int x = ob->x, y = ob->y; |
940 | |
940 | |
941 | op->remove_statbonus (); |
941 | ob->remove_statbonus (); |
942 | op->remove (); |
942 | ob->remove (); |
943 | op->arch = get_player_archetype (op->arch); |
943 | ob->arch = get_player_archetype (ob->arch); |
944 | op->arch->clone.copy_to (op); |
944 | ob->arch->clone.copy_to (ob); |
945 | op->instantiate (); |
945 | ob->instantiate (); |
946 | op->stats = op->contr->orig_stats; |
946 | ob->stats = ob->contr->orig_stats; |
947 | op->name = op->name_pl = name; |
947 | ob->name = ob->name_pl = name; |
948 | op->x = x; |
948 | ob->x = x; |
949 | op->y = y; |
949 | ob->y = y; |
950 | SET_ANIMATION (op, 2); /* So player faces south */ |
950 | SET_ANIMATION (ob, 2); /* So player faces south */ |
951 | insert_ob_in_map (op, op->map, op, 0); |
951 | insert_ob_in_map (ob, ob->map, ob, 0); |
952 | assign (op->contr->title, op->arch->clone.name); |
952 | assign (ob->contr->title, ob->arch->clone.name); |
953 | op->add_statbonus (); |
953 | ob->add_statbonus (); |
954 | tmp_loop = allowed_class (op); |
|
|
955 | } |
954 | } |
|
|
955 | while (!allowed_class (ob)); |
956 | |
956 | |
957 | update_object (op, UP_OBJ_FACE); |
957 | update_object (ob, UP_OBJ_FACE); |
958 | esrv_update_item (UPD_FACE, op, op); |
958 | esrv_update_item (UPD_FACE, ob, ob); |
959 | op->update_stats (); |
959 | ob->update_stats (); |
960 | op->stats.hp = op->stats.maxhp; |
960 | ob->stats.hp = ob->stats.maxhp; |
961 | op->stats.sp = op->stats.maxsp; |
961 | ob->stats.sp = ob->stats.maxsp; |
962 | op->stats.grace = 0; |
962 | ob->stats.grace = 0; |
963 | |
|
|
964 | if (op->msg) |
|
|
965 | new_draw_info (NDI_BLUE, 0, op, op->msg); |
|
|
966 | |
|
|
967 | send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n"); |
|
|
968 | return 0; |
|
|
969 | } |
963 | } |
970 | |
964 | |
971 | void |
965 | void |
972 | flee_player (object *op) |
966 | flee_player (object *op) |
973 | { |
967 | { |
… | |
… | |
1596 | if (op->type == PLAYER) |
1590 | if (op->type == PLAYER) |
1597 | new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); |
1591 | new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); |
1598 | /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ |
1592 | /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ |
1599 | else |
1593 | else |
1600 | CLEAR_FLAG (op, FLAG_READY_BOW); |
1594 | CLEAR_FLAG (op, FLAG_READY_BOW); |
|
|
1595 | |
1601 | return 0; |
1596 | return 0; |
1602 | } |
1597 | } |
1603 | } |
1598 | } |
1604 | |
1599 | |
1605 | mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); |
1600 | mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); |
… | |
… | |
1636 | op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed; |
1631 | op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed; |
1637 | op->update_stats (); |
1632 | op->update_stats (); |
1638 | } |
1633 | } |
1639 | |
1634 | |
1640 | SET_ANIMATION (arrow, arrow->direction); |
1635 | SET_ANIMATION (arrow, arrow->direction); |
|
|
1636 | |
1641 | arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */ |
1637 | arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */ |
1642 | arrow->stats.hp = arrow->stats.dam; |
1638 | arrow->stats.hp = arrow->stats.dam; |
1643 | arrow->stats.grace = arrow->attacktype; |
1639 | arrow->stats.grace = arrow->attacktype; |
|
|
1640 | |
1644 | if (arrow->slaying != NULL) |
1641 | if (arrow->slaying) |
1645 | arrow->spellarg = strdup (arrow->slaying); |
1642 | arrow->spellarg = strdup (arrow->slaying); |
1646 | |
1643 | |
1647 | /* Note that this was different for monsters - they got their level |
1644 | arrow->stats.dam += op->stats.dam + arrow->magic; |
1648 | * added to the damage. I think the strength bonus is more proper. |
|
|
1649 | */ |
|
|
1650 | |
|
|
1651 | arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic; |
|
|
1652 | |
1645 | |
1653 | /* update the speed */ |
1646 | /* update the speed */ |
1654 | arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? |
1647 | arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? |
1655 | 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0; |
1648 | 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0; |
1656 | |
1649 | |
1657 | arrow->set_speed (max (arrow->speed, 1.0)); |
1650 | arrow->set_speed (max (arrow->speed, 1.0)); |
1658 | arrow->speed_left = 0; |
1651 | arrow->speed_left = 0; |
1659 | |
1652 | |
|
|
1653 | arrow->stats.wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc; |
|
|
1654 | |
1660 | if (op->type == PLAYER) |
1655 | if (op->type == PLAYER) |
1661 | { |
1656 | { |
1662 | arrow->stats.wc = 20 - bow->magic - arrow->magic - |
|
|
1663 | (op->chosen_skill ? op->chosen_skill->level : op->level) - |
|
|
1664 | dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod; |
|
|
1665 | |
|
|
1666 | arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; |
1657 | arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; |
|
|
1658 | arrow->stats.wc -= dex_bonus[op->stats.Dex]; |
|
|
1659 | |
|
|
1660 | if (!arrow->slaying) |
|
|
1661 | arrow->slaying = op->slaying; |
1667 | } |
1662 | } |
1668 | else |
1663 | else |
1669 | { |
1664 | { |
1670 | arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod; |
|
|
1671 | arrow->level = op->level; |
1665 | arrow->level = op->level; |
1672 | } |
1666 | arrow->stats.wc -= bow->magic; |
1673 | |
1667 | |
1674 | if (arrow->attacktype == AT_PHYSICAL) |
1668 | if (!arrow->slaying) |
|
|
1669 | arrow->slaying = bow->slaying; |
|
|
1670 | } |
|
|
1671 | |
|
|
1672 | arrow->stats.wc -= arrow->level; |
|
|
1673 | |
1675 | arrow->attacktype |= bow->attacktype; |
1674 | arrow->attacktype |= bow->attacktype; |
1676 | |
|
|
1677 | if (bow->slaying) |
|
|
1678 | arrow->slaying = bow->slaying; |
|
|
1679 | |
1675 | |
1680 | arrow->move_type = MOVE_FLY_LOW; |
1676 | arrow->move_type = MOVE_FLY_LOW; |
1681 | arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; |
1677 | arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; |
1682 | |
1678 | |
1683 | play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); |
1679 | play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); |
… | |
… | |
1836 | case range_misc: |
1832 | case range_misc: |
1837 | fire_misc_object (op, dir); |
1833 | fire_misc_object (op, dir); |
1838 | return; |
1834 | return; |
1839 | |
1835 | |
1840 | case range_golem: /* Control summoned monsters from scrolls */ |
1836 | case range_golem: /* Control summoned monsters from scrolls */ |
1841 | if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED)) |
|
|
1842 | { |
|
|
1843 | op->contr->ranges[range_golem] = 0; |
|
|
1844 | op->contr->shoottype = range_none; |
|
|
1845 | } |
|
|
1846 | else |
|
|
1847 | control_golem (op->contr->ranges[range_golem], dir); |
1837 | control_golem (op->contr->ranges[range_golem], dir); |
1848 | return; |
1838 | return; |
1849 | |
1839 | |
1850 | case range_skill: |
1840 | case range_skill: |
1851 | if (!op->chosen_skill) |
1841 | if (!op->chosen_skill) |
1852 | { |
1842 | { |
1853 | if (op->type == PLAYER) |
1843 | if (op->type == PLAYER) |
1854 | new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use."); |
1844 | new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use."); |
|
|
1845 | |
1855 | return; |
1846 | return; |
1856 | } |
1847 | } |
1857 | |
1848 | |
1858 | do_skill (op, op, op->chosen_skill, dir, NULL); |
1849 | do_skill (op, op, op->chosen_skill, dir, NULL); |
1859 | return; |
1850 | return; |
… | |
… | |
1970 | if (key) |
1961 | if (key) |
1971 | { |
1962 | { |
1972 | object *container = key->env; |
1963 | object *container = key->env; |
1973 | |
1964 | |
1974 | play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); |
1965 | play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); |
|
|
1966 | |
1975 | if (action_makes_visible (op)) |
1967 | if (action_makes_visible (op)) |
1976 | make_visible (op); |
1968 | make_visible (op); |
|
|
1969 | |
1977 | if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) |
1970 | if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) |
1978 | spring_trap (door->inv, op); |
1971 | spring_trap (door->inv, op); |
1979 | |
1972 | |
1980 | if (door->type == DOOR) |
1973 | if (door->type == DOOR) |
1981 | hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ |
1974 | hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ |
… | |
… | |
2011 | */ |
2004 | */ |
2012 | void |
2005 | void |
2013 | move_player_attack (object *op, int dir) |
2006 | move_player_attack (object *op, int dir) |
2014 | { |
2007 | { |
2015 | object *tmp, *mon; |
2008 | object *tmp, *mon; |
2016 | sint16 nx, ny; |
|
|
2017 | int on_battleground; |
2009 | int on_battleground; |
2018 | maptile *m; |
2010 | maptile *m; |
2019 | |
2011 | |
2020 | nx = freearr_x[dir] + op->x; |
2012 | sint16 nx = freearr_x[dir] + op->x; |
2021 | ny = freearr_y[dir] + op->y; |
2013 | sint16 ny = freearr_y[dir] + op->y; |
2022 | |
2014 | |
2023 | on_battleground = op_on_battleground (op, 0, 0); |
2015 | on_battleground = op_on_battleground (op, 0, 0); |
2024 | |
2016 | |
2025 | /* If braced, or can't move to the square, and it is not out of the |
2017 | /* If braced, or can't move to the square, and it is not out of the |
2026 | * map, attack it. Note order of if statement is important - don't |
2018 | * map, attack it. Note order of if statement is important - don't |
… | |
… | |
2106 | /* If we're braced, we don't want to switch places with it */ |
2098 | /* If we're braced, we don't want to switch places with it */ |
2107 | if (op->contr->braced) |
2099 | if (op->contr->braced) |
2108 | return; |
2100 | return; |
2109 | |
2101 | |
2110 | play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); |
2102 | play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); |
2111 | (void) push_ob (mon, dir, op); |
2103 | push_ob (mon, dir, op); |
2112 | if (op->contr->tmp_invis || op->hide) |
2104 | if (op->contr->tmp_invis || op->hide) |
2113 | make_visible (op); |
2105 | make_visible (op); |
2114 | |
2106 | |
2115 | return; |
2107 | return; |
2116 | } |
2108 | } |
… | |
… | |
2256 | * Returns true if there are more actions we can do. |
2248 | * Returns true if there are more actions we can do. |
2257 | */ |
2249 | */ |
2258 | int |
2250 | int |
2259 | handle_newcs_player (object *op) |
2251 | handle_newcs_player (object *op) |
2260 | { |
2252 | { |
2261 | if (op->contr->hidden) |
|
|
2262 | { |
|
|
2263 | op->invisible = 1000; |
|
|
2264 | /* the socket code flashes the player visible/invisible |
|
|
2265 | * depending on the value of invisible, so we need to |
|
|
2266 | * alternate it here for it to work correctly. |
|
|
2267 | */ |
|
|
2268 | if (pticks & 2) |
|
|
2269 | op->invisible--; |
|
|
2270 | } |
|
|
2271 | else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS))) |
|
|
2272 | { |
|
|
2273 | op->invisible--; |
|
|
2274 | if (!op->invisible) |
|
|
2275 | { |
|
|
2276 | make_visible (op); |
|
|
2277 | new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out."); |
|
|
2278 | } |
|
|
2279 | } |
|
|
2280 | |
|
|
2281 | if (QUERY_FLAG (op, FLAG_SCARED)) |
2253 | if (QUERY_FLAG (op, FLAG_SCARED)) |
2282 | { |
2254 | { |
2283 | flee_player (op); |
2255 | flee_player (op); |
2284 | /* If player is still scared, that is his action for this tick */ |
2256 | /* If player is still scared, that is his action for this tick */ |
2285 | if (QUERY_FLAG (op, FLAG_SCARED)) |
2257 | if (QUERY_FLAG (op, FLAG_SCARED)) |
2286 | { |
2258 | { |
2287 | op->speed_left--; |
2259 | op->speed_left--; |
2288 | return 0; |
2260 | return 0; |
2289 | } |
2261 | } |
2290 | } |
2262 | } |
2291 | |
|
|
2292 | /* I've been seeing crashes where the golem has been destroyed, but |
|
|
2293 | * the player object still points to the defunct golem. The code that |
|
|
2294 | * destroys the golem looks correct, and it doesn't always happen, so |
|
|
2295 | * put this in a a workaround to clean up the golem pointer. |
|
|
2296 | */ |
|
|
2297 | if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED)) |
|
|
2298 | op->contr->ranges[range_golem] = 0; |
|
|
2299 | |
2263 | |
2300 | /* call this here - we also will call this in do_ericserver, but |
2264 | /* call this here - we also will call this in do_ericserver, but |
2301 | * the players time has been increased when doericserver has been |
2265 | * the players time has been increased when doericserver has been |
2302 | * called, so we recheck it here. |
2266 | * called, so we recheck it here. |
2303 | */ |
2267 | */ |
… | |
… | |
2439 | int rate_grace = 2000; |
2403 | int rate_grace = 2000; |
2440 | const int max_hp = 1; |
2404 | const int max_hp = 1; |
2441 | const int max_sp = 1; |
2405 | const int max_sp = 1; |
2442 | const int max_grace = 1; |
2406 | const int max_grace = 1; |
2443 | |
2407 | |
2444 | if (op->contr->outputs_sync) |
2408 | if (op->contr->hidden) |
|
|
2409 | { |
|
|
2410 | op->invisible = 1000; |
|
|
2411 | /* the socket code flashes the player visible/invisible |
|
|
2412 | * depending on the value of invisible, so we need to |
|
|
2413 | * alternate it here for it to work correctly. |
|
|
2414 | */ |
|
|
2415 | if (pticks & 2) |
|
|
2416 | op->invisible--; |
2445 | { |
2417 | } |
2446 | for (i = 0; i < NUM_OUTPUT_BUFS; i++) |
2418 | else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS))) |
2447 | if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) |
2419 | { |
2448 | flush_output_element (op, &op->contr->outputs[i]); |
2420 | if (!op->invisible--) |
|
|
2421 | { |
|
|
2422 | make_visible (op); |
|
|
2423 | new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out."); |
|
|
2424 | } |
2449 | } |
2425 | } |
2450 | |
2426 | |
2451 | if (op->contr->ns->state == ST_PLAYING) |
2427 | if (op->contr->ns->state == ST_PLAYING) |
2452 | { |
2428 | { |
2453 | /* these next three if clauses make it possible to SLOW DOWN |
2429 | /* these next three if clauses make it possible to SLOW DOWN |
… | |
… | |
2475 | gen_grace = op->stats.maxgrace; |
2451 | gen_grace = op->stats.maxgrace; |
2476 | rate_grace -= rate_grace / 2 * op->contr->gen_grace; |
2452 | rate_grace -= rate_grace / 2 * op->contr->gen_grace; |
2477 | } |
2453 | } |
2478 | |
2454 | |
2479 | /* Regenerate Spell Points */ |
2455 | /* Regenerate Spell Points */ |
2480 | if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0) |
2456 | if (!op->contr->ranges[range_golem] && --op->last_sp < 0) |
2481 | { |
2457 | { |
2482 | gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); |
2458 | gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); |
2483 | if (op->stats.sp < op->stats.maxsp) |
2459 | if (op->stats.sp < op->stats.maxsp) |
2484 | { |
2460 | { |
2485 | op->stats.sp++; |
2461 | op->stats.sp++; |
… | |
… | |
2910 | op->stats.hp = op->stats.maxhp; |
2886 | op->stats.hp = op->stats.maxhp; |
2911 | op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); |
2887 | op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); |
2912 | op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); |
2888 | op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); |
2913 | |
2889 | |
2914 | /* |
2890 | /* |
2915 | * Check to see if the player is in a shop. IF so, then check to see if |
|
|
2916 | * the player has any unpaid items. If so, remove them and put them back |
2891 | * Check to see if the player has any unpaid items. If so, remove them |
2917 | * in the map. |
2892 | * and put them back in the map. |
2918 | */ |
2893 | */ |
2919 | |
|
|
2920 | if (is_in_shop (op)) |
|
|
2921 | remove_unpaid_objects (op->inv, op); |
2894 | remove_unpaid_objects (op->inv, op); |
2922 | |
2895 | |
2923 | /****************************************/ |
2896 | /****************************************/ |
2924 | /* */ |
2897 | /* */ |
2925 | /* Move player to his current respawn- */ |
2898 | /* Move player to his current respawn- */ |
2926 | /* position (usually last savebed) */ |
2899 | /* position (usually last savebed) */ |
… | |
… | |
3071 | if (op->type == PLAYER) |
3044 | if (op->type == PLAYER) |
3072 | { |
3045 | { |
3073 | op->contr->tmp_invis = 0; |
3046 | op->contr->tmp_invis = 0; |
3074 | op->contr->invis_race = 0; |
3047 | op->contr->invis_race = 0; |
3075 | } |
3048 | } |
|
|
3049 | |
3076 | update_object (op, UP_OBJ_FACE); |
3050 | update_object (op, UP_OBJ_CHANGE); |
3077 | } |
3051 | } |
3078 | |
3052 | |
3079 | int |
3053 | int |
3080 | is_true_undead (object *op) |
3054 | is_true_undead (object *op) |
3081 | { |
3055 | { |
… | |
… | |
3374 | char buf[MAX_BUF]; /* tmp. string buffer */ |
3348 | char buf[MAX_BUF]; /* tmp. string buffer */ |
3375 | int i = 0, j = 0; |
3349 | int i = 0, j = 0; |
3376 | |
3350 | |
3377 | /* get the appropriate treasurelist */ |
3351 | /* get the appropriate treasurelist */ |
3378 | if (atnr == ATNR_FIRE) |
3352 | if (atnr == ATNR_FIRE) |
3379 | trlist = find_treasurelist ("dragon_ability_fire"); |
3353 | trlist = treasurelist::find ("dragon_ability_fire"); |
3380 | else if (atnr == ATNR_COLD) |
3354 | else if (atnr == ATNR_COLD) |
3381 | trlist = find_treasurelist ("dragon_ability_cold"); |
3355 | trlist = treasurelist::find ("dragon_ability_cold"); |
3382 | else if (atnr == ATNR_ELECTRICITY) |
3356 | else if (atnr == ATNR_ELECTRICITY) |
3383 | trlist = find_treasurelist ("dragon_ability_elec"); |
3357 | trlist = treasurelist::find ("dragon_ability_elec"); |
3384 | else if (atnr == ATNR_POISON) |
3358 | else if (atnr == ATNR_POISON) |
3385 | trlist = find_treasurelist ("dragon_ability_poison"); |
3359 | trlist = treasurelist::find ("dragon_ability_poison"); |
3386 | |
3360 | |
3387 | if (trlist == NULL || who->type != PLAYER) |
3361 | if (trlist == NULL || who->type != PLAYER) |
3388 | return; |
3362 | return; |
3389 | |
3363 | |
3390 | for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); |
3364 | for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); |