1 | /* |
1 | /* |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | * |
3 | * |
4 | * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
4 | * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
7 | * |
7 | * |
8 | * Deliantra is free software: you can redistribute it and/or modify |
8 | * Deliantra is free software: you can redistribute it and/or modify it under |
9 | * it under the terms of the GNU General Public License as published by |
9 | * the terms of the Affero GNU General Public License as published by the |
10 | * the Free Software Foundation, either version 3 of the License, or |
10 | * Free Software Foundation, either version 3 of the License, or (at your |
11 | * (at your option) any later version. |
11 | * option) any later version. |
12 | * |
12 | * |
13 | * This program is distributed in the hope that it will be useful, |
13 | * This program is distributed in the hope that it will be useful, |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | * GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
17 | * |
17 | * |
18 | * You should have received a copy of the GNU General Public License |
18 | * You should have received a copy of the Affero GNU General Public License |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
19 | * and the GNU General Public License along with this program. If not, see |
|
|
20 | * <http://www.gnu.org/licenses/>. |
20 | * |
21 | * |
21 | * The authors can be reached via e-mail to <support@deliantra.net> |
22 | * The authors can be reached via e-mail to <support@deliantra.net> |
22 | */ |
23 | */ |
23 | |
24 | |
24 | #include <global.h> |
25 | #include <global.h> |
… | |
… | |
32 | #include <algorithm> |
33 | #include <algorithm> |
33 | #include <functional> |
34 | #include <functional> |
34 | |
35 | |
35 | playervec players; |
36 | playervec players; |
36 | |
37 | |
37 | void |
|
|
38 | display_motd (const object *op) |
|
|
39 | { |
|
|
40 | char buf[MAX_BUF]; |
|
|
41 | char motd[HUGE_BUF]; |
|
|
42 | FILE *fp; |
|
|
43 | int comp; |
|
|
44 | int size; |
|
|
45 | |
|
|
46 | sprintf (buf, "%s/%s", settings.confdir, settings.motd); |
|
|
47 | if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) |
|
|
48 | return; |
|
|
49 | |
|
|
50 | motd[0] = '\0'; |
|
|
51 | size = 0; |
|
|
52 | |
|
|
53 | while (fgets (buf, MAX_BUF, fp)) |
|
|
54 | { |
|
|
55 | if (*buf == '#') |
|
|
56 | continue; |
|
|
57 | |
|
|
58 | strncat (motd + size, buf, HUGE_BUF - size); |
|
|
59 | size += strlen (buf); |
|
|
60 | } |
|
|
61 | |
|
|
62 | draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL); |
|
|
63 | close_and_delete (fp, comp); |
|
|
64 | } |
|
|
65 | |
|
|
66 | void |
|
|
67 | send_rules (const object *op) |
|
|
68 | { |
|
|
69 | char buf[MAX_BUF]; |
|
|
70 | char rules[HUGE_BUF]; |
|
|
71 | FILE *fp; |
|
|
72 | int comp; |
|
|
73 | int size; |
|
|
74 | |
|
|
75 | sprintf (buf, "%s/%s", settings.confdir, settings.rules); |
|
|
76 | if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) |
|
|
77 | return; |
|
|
78 | |
|
|
79 | rules[0] = '\0'; |
|
|
80 | size = 0; |
|
|
81 | |
|
|
82 | while (fgets (buf, MAX_BUF, fp)) |
|
|
83 | { |
|
|
84 | if (*buf == '#') |
|
|
85 | continue; |
|
|
86 | |
|
|
87 | if (size + strlen (buf) >= HUGE_BUF) |
|
|
88 | { |
|
|
89 | LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF); |
|
|
90 | break; |
|
|
91 | } |
|
|
92 | |
|
|
93 | strncat (rules + size, buf, HUGE_BUF - size); |
|
|
94 | size += strlen (buf); |
|
|
95 | } |
|
|
96 | |
|
|
97 | draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL); |
|
|
98 | close_and_delete (fp, comp); |
|
|
99 | } |
|
|
100 | |
|
|
101 | void |
|
|
102 | send_news (const object *op) |
|
|
103 | { |
|
|
104 | char buf[MAX_BUF]; |
|
|
105 | char news[HUGE_BUF]; |
|
|
106 | char subject[MAX_BUF]; |
|
|
107 | FILE *fp; |
|
|
108 | int comp; |
|
|
109 | int size; |
|
|
110 | |
|
|
111 | sprintf (buf, "%s/%s", settings.confdir, settings.news); |
|
|
112 | if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) |
|
|
113 | return; |
|
|
114 | |
|
|
115 | news[0] = '\0'; |
|
|
116 | subject[0] = '\0'; |
|
|
117 | size = 0; |
|
|
118 | |
|
|
119 | while (fgets (buf, MAX_BUF, fp)) |
|
|
120 | { |
|
|
121 | if (*buf == '#') |
|
|
122 | continue; |
|
|
123 | |
|
|
124 | if (*buf == '%') |
|
|
125 | { /* send one news */ |
|
|
126 | if (size > 0) |
|
|
127 | 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 */ |
|
|
128 | |
|
|
129 | strcpy (subject, buf + 1); |
|
|
130 | strip_endline (subject); |
|
|
131 | size = 0; |
|
|
132 | news[0] = '\0'; |
|
|
133 | } |
|
|
134 | else |
|
|
135 | { |
|
|
136 | if (size + strlen (buf) >= HUGE_BUF) |
|
|
137 | { |
|
|
138 | LOG (llevDebug, "Warning, one news item has size > %d bytes.\n", HUGE_BUF); |
|
|
139 | break; |
|
|
140 | } |
|
|
141 | strncat (news + size, buf, HUGE_BUF - size); |
|
|
142 | size += strlen (buf); |
|
|
143 | } |
|
|
144 | } |
|
|
145 | |
|
|
146 | draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, |
|
|
147 | MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news); |
|
|
148 | close_and_delete (fp, comp); |
|
|
149 | } |
|
|
150 | |
|
|
151 | /* This loads the first map an puts the player on it. */ |
38 | /* This loads the first map an puts the player on it. */ |
152 | static void |
39 | static void |
153 | set_first_map (object *op) |
40 | set_first_map (object *op) |
154 | { |
41 | { |
155 | op->contr->maplevel = first_map_path; |
42 | op->contr->maplevel = first_map_path; |
… | |
… | |
207 | ob->close_container (); //TODO: client-specific |
94 | ob->close_container (); //TODO: client-specific |
208 | |
95 | |
209 | ns->update_look = 0; |
96 | ns->update_look = 0; |
210 | ns->look_position = 0; |
97 | ns->look_position = 0; |
211 | |
98 | |
212 | clear_los (this); |
99 | clear_los (); |
213 | |
100 | |
214 | ns->reset_stats (); |
101 | ns->reset_stats (); |
215 | |
102 | |
216 | /* make sure he's a player -- needed because of class change. */ |
103 | /* make sure he's a player -- needed because of class change. */ |
217 | ob->type = PLAYER; // we are paranoid |
104 | ob->type = PLAYER; // we are paranoid |
218 | ob->race = ob->arch->race; |
105 | ob->race = ob->arch->race; |
219 | |
106 | |
220 | ob->update_weight (); |
107 | ob->update_weight (); |
221 | link_player_skills (ob); |
108 | link_skills (); |
222 | |
109 | |
223 | CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); |
110 | CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); |
224 | |
111 | |
225 | assign (title, ob->arch->object::name); |
112 | assign (title, ob->arch->object::name); |
226 | |
113 | |
… | |
… | |
239 | set_dragon_name (ob, abil, skin); |
126 | set_dragon_name (ob, abil, skin); |
240 | } |
127 | } |
241 | |
128 | |
242 | new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); |
129 | new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); |
243 | |
130 | |
244 | esrv_new_player (this, ob->weight + ob->carrying); |
131 | esrv_new_player (this); |
245 | |
132 | |
246 | ob->update_stats (); |
133 | ob->update_stats (); |
247 | |
134 | |
248 | ns->floorbox_update (); |
135 | ns->floorbox_update (); |
249 | esrv_send_inventory (ob, ob); |
136 | esrv_send_inventory (ob, ob); |
250 | esrv_add_spells (this, 0); |
137 | esrv_add_spells (this, 0); |
251 | |
138 | |
252 | activate (); |
139 | activate (); |
253 | |
140 | |
254 | send_rules (ob); |
|
|
255 | send_news (ob); |
|
|
256 | display_motd (ob); |
|
|
257 | |
|
|
258 | INVOKE_PLAYER (CONNECT, this); |
141 | INVOKE_PLAYER (CONNECT, this); |
259 | INVOKE_PLAYER (LOGIN, this); |
142 | INVOKE_PLAYER (LOGIN, this); |
260 | } |
143 | } |
261 | |
144 | |
262 | void |
145 | void |
… | |
… | |
278 | ns->reset_stats (); |
161 | ns->reset_stats (); |
279 | ns->pl = 0; |
162 | ns->pl = 0; |
280 | ns = 0; |
163 | ns = 0; |
281 | } |
164 | } |
282 | |
165 | |
283 | observe = ob; |
166 | // this is important for the player scheduler to get the correct refcount |
|
|
167 | // when ns = 0 |
|
|
168 | observe = viewpoint = ob; |
284 | |
169 | |
285 | deactivate (); |
170 | deactivate (); |
286 | } |
171 | } |
287 | |
172 | |
288 | // the need for this function can be explained |
173 | // the need for this function can be explained |
289 | // by load_object not returning the object |
174 | // by load_object not returning the object |
290 | void |
175 | void |
291 | player::set_object (object *op) |
176 | player::set_object (object *op) |
292 | { |
177 | { |
293 | ob = observe = op; |
178 | ob = observe = viewpoint = op; |
294 | ob->contr = this; /* this aren't yet in archetype */ |
179 | ob->contr = this; /* this aren't yet in archetype */ |
295 | |
180 | |
296 | ob->speed = 1.0f; |
181 | ob->speed = 1.0f; |
297 | ob->speed_left = 0.5f; |
182 | ob->speed_left = 0.5f; |
298 | |
183 | |
299 | ob->direction = 5; /* So player faces south */ |
184 | ob->direction = 5; /* So player faces south */ |
300 | |
185 | |
301 | ob->flag [FLAG_READY_WEAPON] = false; |
186 | ob->flag [FLAG_READY_WEAPON] = false; |
302 | ob->flag [FLAG_READY_SKILL] = false; |
187 | ob->flag [FLAG_READY_SKILL] = false; |
303 | ob->flag [FLAG_READY_BOW] = false; |
188 | ob->flag [FLAG_READY_BOW] = false; |
304 | |
189 | |
… | |
… | |
321 | combat_ob = op; |
206 | combat_ob = op; |
322 | break; |
207 | break; |
323 | } |
208 | } |
324 | |
209 | |
325 | ob->change_weapon (combat_ob ? combat_ob : ranged_ob); |
210 | ob->change_weapon (combat_ob ? combat_ob : ranged_ob); |
326 | ob->deactivate (); // change_Weapon activates, fix this better |
211 | ob->deactivate (); // change_weapon activates, fix this better |
327 | } |
212 | } |
328 | |
213 | |
329 | void |
214 | void |
330 | player::set_observe (object *op) |
215 | player::set_observe (object *op) |
331 | { |
216 | { |
332 | observe = op ? op : ob; |
217 | observe = viewpoint = op ? op : ob; |
|
|
218 | do_los = 1; |
|
|
219 | } |
|
|
220 | |
|
|
221 | void |
|
|
222 | player::set_viewpoint (object *op) |
|
|
223 | { |
|
|
224 | viewpoint = op ? op : (object *)observe; |
333 | do_los = 1; |
225 | do_los = 1; |
334 | } |
226 | } |
335 | |
227 | |
336 | player::player () |
228 | player::player () |
337 | { |
229 | { |
… | |
… | |
345 | savebed_map = first_map_path; /* Init. respawn position */ |
237 | savebed_map = first_map_path; /* Init. respawn position */ |
346 | |
238 | |
347 | gen_sp_armour = 10; |
239 | gen_sp_armour = 10; |
348 | bowtype = bow_normal; |
240 | bowtype = bow_normal; |
349 | petmode = pet_normal; |
241 | petmode = pet_normal; |
350 | listening = 10; |
|
|
351 | usekeys = containers; |
242 | usekeys = containers; |
352 | peaceful = 1; /* default peaceful */ |
243 | peaceful = 1; /* default peaceful */ |
353 | do_los = 1; |
244 | do_los = 1; |
354 | |
245 | |
355 | weapon_sp = 1.0f; |
246 | weapon_sp = 1.0f; |
… | |
… | |
367 | { |
258 | { |
368 | ob->destroy_inv (false); |
259 | ob->destroy_inv (false); |
369 | ob->destroy (); |
260 | ob->destroy (); |
370 | } |
261 | } |
371 | |
262 | |
372 | ob = observe = 0; |
263 | ob = observe = viewpoint = 0; |
373 | } |
264 | } |
374 | |
265 | |
375 | player::~player () |
266 | player::~player () |
376 | { |
267 | { |
377 | /* Clear item stack */ |
268 | /* Clear item stack */ |
… | |
… | |
671 | op->destroy (); |
562 | op->destroy (); |
672 | continue; |
563 | continue; |
673 | } |
564 | } |
674 | } |
565 | } |
675 | |
566 | |
676 | /* This really needs to be better - we should really give |
567 | /* Here we remove duplicated skills (as duplicated spell objects have |
677 | * a substitute spellbook. The problem is that we don't really |
568 | * _very_ confusing effects for players), which could for instance be |
678 | * have a good idea what to replace it with (need something like |
569 | * generated by bad treasurelists. - elmex |
679 | * a first level treasurelist for each skill.) |
|
|
680 | * remove duplicate skills also |
|
|
681 | */ |
570 | */ |
682 | if (op->type == SPELLBOOK || op->type == SKILL) |
571 | if (op->type == SKILL) |
683 | { |
572 | { |
684 | object *tmp; |
|
|
685 | |
|
|
686 | for (tmp = op->below; tmp; tmp = tmp->below) |
573 | for (object *tmp = op->below; tmp; tmp = tmp->below) |
687 | if (tmp->type == op->type && tmp->name == op->name) |
574 | if (tmp->type == op->type && tmp->name == op->name) |
688 | break; |
|
|
689 | |
|
|
690 | if (tmp) |
|
|
691 | { |
575 | { |
692 | op->destroy (); |
576 | op->destroy (); |
|
|
577 | LOG (llevError, |
693 | LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name); |
578 | "give_initial_items: Removing duplicate skill %s\n", &tmp->name); |
694 | continue; |
579 | break; |
695 | } |
580 | } |
696 | |
581 | |
697 | if (op->nrof > 1) |
582 | if (op->nrof > 1) |
698 | op->nrof = 1; |
583 | op->nrof = 1; |
699 | } |
584 | } |
700 | |
585 | |
… | |
… | |
726 | else /* lock all 'normal items by default */ |
611 | else /* lock all 'normal items by default */ |
727 | SET_FLAG (op, FLAG_INV_LOCKED); |
612 | SET_FLAG (op, FLAG_INV_LOCKED); |
728 | } /* for loop of objects in player inv */ |
613 | } /* for loop of objects in player inv */ |
729 | |
614 | |
730 | /* Need to set up the skill pointers */ |
615 | /* Need to set up the skill pointers */ |
731 | link_player_skills (pl); |
616 | pl->contr->link_skills (); |
732 | } |
617 | } |
733 | |
618 | |
734 | void |
619 | void |
735 | get_party_password (object *op, partylist *party) |
620 | get_party_password (object *op, partylist *party) |
736 | { |
621 | { |
… | |
… | |
851 | */ |
736 | */ |
852 | void |
737 | void |
853 | player::chargen_race_done () |
738 | player::chargen_race_done () |
854 | { |
739 | { |
855 | /* this must before then initial items are given */ |
740 | /* this must before then initial items are given */ |
856 | esrv_new_player (ob->contr, ob->weight + ob->carrying); |
741 | esrv_new_player (ob->contr); |
857 | |
742 | |
858 | treasurelist *tl = treasurelist::find ("starting_wealth"); |
743 | treasurelist *tl = treasurelist::find ("starting_wealth"); |
859 | if (tl) |
744 | if (tl) |
860 | create_treasure (tl, ob, 0, 0, 0); |
745 | create_treasure (tl, ob, 0, 0, 0); |
861 | |
746 | |
… | |
… | |
865 | ob->contr->ns->state = ST_PLAYING; |
750 | ob->contr->ns->state = ST_PLAYING; |
866 | |
751 | |
867 | if (ob->msg) |
752 | if (ob->msg) |
868 | ob->msg = 0; |
753 | ob->msg = 0; |
869 | |
754 | |
870 | /* We create this now because some of the unique maps will need it |
|
|
871 | * to save here. |
|
|
872 | */ |
|
|
873 | { |
|
|
874 | char buf[MAX_BUF]; |
|
|
875 | sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name); |
|
|
876 | make_path_to_file (buf); |
|
|
877 | } |
|
|
878 | |
|
|
879 | start_info (ob); |
755 | start_info (ob); |
880 | CLEAR_FLAG (ob, FLAG_WIZ); |
756 | CLEAR_FLAG (ob, FLAG_WIZ); |
881 | give_initial_items (ob, ob->randomitems); |
757 | give_initial_items (ob, ob->randomitems); |
882 | link_player_skills (ob); |
|
|
883 | esrv_send_inventory (ob, ob); |
758 | esrv_send_inventory (ob, ob); |
884 | ob->update_stats (); |
759 | ob->update_stats (); |
885 | |
760 | |
886 | /* This moves the player to a different start map, if there |
761 | /* This moves the player to a different start map, if there |
887 | * is one for this race |
762 | * is one for this race |
888 | */ |
763 | */ |
889 | if (*first_map_ext_path) |
764 | if (*first_map_ext_path) |
890 | { |
765 | ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y); |
891 | object *tmp; |
|
|
892 | char mapname[MAX_BUF]; |
|
|
893 | |
|
|
894 | snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname); |
|
|
895 | tmp = object::create (); |
|
|
896 | EXIT_PATH (tmp) = mapname; |
|
|
897 | EXIT_X (tmp) = ob->x; |
|
|
898 | EXIT_Y (tmp) = ob->y; |
|
|
899 | ob->enter_exit (tmp); /* we don't really care if it succeeded; |
|
|
900 | * if the map isn't there, then stay on the |
|
|
901 | * default initial map */ |
|
|
902 | tmp->destroy (); |
|
|
903 | } |
|
|
904 | else |
766 | else |
905 | LOG (llevDebug, "first_map_ext_path not set\n"); |
767 | LOG (llevDebug, "first_map_ext_path not set\n"); |
906 | } |
768 | } |
907 | |
769 | |
908 | void |
770 | void |
… | |
… | |
952 | LOG (llevDebug, "Fleeing player is dead.\n"); |
814 | LOG (llevDebug, "Fleeing player is dead.\n"); |
953 | CLEAR_FLAG (op, FLAG_SCARED); |
815 | CLEAR_FLAG (op, FLAG_SCARED); |
954 | return; |
816 | return; |
955 | } |
817 | } |
956 | |
818 | |
957 | if (op->enemy == NULL) |
819 | if (!op->enemy) |
958 | { |
820 | { |
959 | LOG (llevDebug, "Fleeing player had no enemy.\n"); |
821 | LOG (llevDebug, "Fleeing player had no enemy.\n"); |
960 | CLEAR_FLAG (op, FLAG_SCARED); |
822 | CLEAR_FLAG (op, FLAG_SCARED); |
961 | return; |
823 | return; |
962 | } |
824 | } |
963 | |
825 | |
964 | /* Seen some crashes here. Since we don't store an |
|
|
965 | * op->enemy_count, it is possible that something destroys the |
|
|
966 | * actual enemy, and the object is recycled. |
|
|
967 | */ |
|
|
968 | if (op->enemy->map == NULL) |
|
|
969 | { |
|
|
970 | CLEAR_FLAG (op, FLAG_SCARED); |
|
|
971 | op->enemy = NULL; |
|
|
972 | return; |
|
|
973 | } |
|
|
974 | |
|
|
975 | if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0)) |
826 | if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0)) |
976 | { |
827 | { |
977 | op->enemy = NULL; |
828 | op->enemy = NULL; |
978 | CLEAR_FLAG (op, FLAG_SCARED); |
829 | CLEAR_FLAG (op, FLAG_SCARED); |
979 | return; |
830 | return; |
… | |
… | |
982 | get_rangevector (op, op->enemy, &rv, 0); |
833 | get_rangevector (op, op->enemy, &rv, 0); |
983 | |
834 | |
984 | dir = absdir (4 + rv.direction); |
835 | dir = absdir (4 + rv.direction); |
985 | for (diff = 0; diff < 3; diff++) |
836 | for (diff = 0; diff < 3; diff++) |
986 | { |
837 | { |
987 | int m = 1 - (RANDOM () & 2); |
838 | int m = 1 - rndm (2) * 2; |
988 | |
839 | |
989 | if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op))) |
840 | if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op))) |
990 | return; |
841 | return; |
991 | } |
842 | } |
992 | |
843 | |
… | |
… | |
1003 | check_pick (object *op) |
854 | check_pick (object *op) |
1004 | { |
855 | { |
1005 | object *tmp, *next; |
856 | object *tmp, *next; |
1006 | int stop = 0; |
857 | int stop = 0; |
1007 | int wvratio; |
858 | int wvratio; |
1008 | char putstring[128]; |
|
|
1009 | |
859 | |
1010 | /* if you're flying, you cna't pick up anything */ |
860 | /* if you're flying, you cna't pick up anything */ |
1011 | if (op->move_type & MOVE_FLYING) |
861 | if (op->move_type & MOVE_FLYING) |
1012 | return 1; |
862 | return 1; |
1013 | |
863 | |
… | |
… | |
1037 | |
887 | |
1038 | if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) |
888 | if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) |
1039 | { |
889 | { |
1040 | if (item_matched_string (op, tmp, op->contr->search_str)) |
890 | if (item_matched_string (op, tmp, op->contr->search_str)) |
1041 | CHK_PICK_PICKUP; |
891 | CHK_PICK_PICKUP; |
|
|
892 | |
1042 | continue; |
893 | continue; |
1043 | } |
894 | } |
1044 | |
895 | |
1045 | /* high not bit set? We're using the old autopickup model */ |
896 | /* pickup handling */ |
|
|
897 | if (op->contr->mode & PU_DEBUG) |
|
|
898 | { |
|
|
899 | /* some debugging code to figure out item information */ |
|
|
900 | const char *str = tmp->name |
|
|
901 | ? format ("item name: %s item type: %d weight/value: %d", |
|
|
902 | &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))) |
|
|
903 | : format ("item name: %s item type: %d weight/value: %d", |
|
|
904 | &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); |
|
|
905 | |
|
|
906 | new_draw_info (NDI_UNIQUE, 0, op, str); |
|
|
907 | } |
|
|
908 | |
|
|
909 | if (op->contr->mode & PU_INHIBIT) |
|
|
910 | return 1; |
|
|
911 | |
|
|
912 | if (!(op->contr->mode & PU_ENABLE)) // TODO: fix client |
|
|
913 | return 1; |
|
|
914 | |
|
|
915 | /* philosophy: |
|
|
916 | * It's easy to grab an item type from a pile, as long as it's |
|
|
917 | * generic. This takes no game-time. For more detailed pickups |
|
|
918 | * and selections, select-items should be used. This is a |
|
|
919 | * grab-as-you-run type mode that's really useful for arrows for |
|
|
920 | * example. |
|
|
921 | * The drawback: right now it has no frontend, so you need to |
|
|
922 | * stick the bits you want into a calculator in hex mode and then |
|
|
923 | * convert to decimal and then 'pickup <#> |
|
|
924 | */ |
|
|
925 | |
|
|
926 | /* the first two modes are exclusive: if NOTHING we return, if |
|
|
927 | * STOP then we stop. All the rest are applied sequentially, |
|
|
928 | * meaning if any test passes, the item gets picked up. */ |
|
|
929 | |
|
|
930 | /* if mode is set to pick nothing up, return */ |
|
|
931 | if (op->contr->mode == PU_NOTHING) |
|
|
932 | return 1; |
|
|
933 | |
|
|
934 | /* if mode is set to stop when encountering objects, return */ |
|
|
935 | /* take STOP before INHIBIT since it doesn't actually pick |
|
|
936 | * anything up */ |
|
|
937 | if (op->contr->mode & PU_STOP) |
|
|
938 | return 0; |
|
|
939 | |
|
|
940 | /* useful for going into stores and not losing your settings... */ |
|
|
941 | /* and for battles wher you don't want to get loaded down while |
|
|
942 | * fighting */ |
|
|
943 | if (op->contr->mode & PU_INHIBIT) |
|
|
944 | return 1; |
|
|
945 | |
|
|
946 | /* prevent us from turning into auto-thieves :) */ |
|
|
947 | if (QUERY_FLAG (tmp, FLAG_UNPAID)) |
|
|
948 | continue; |
|
|
949 | |
|
|
950 | /* ignore known cursed objects */ |
|
|
951 | if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED) |
|
|
952 | continue; |
|
|
953 | |
|
|
954 | /* all food and drink if desired */ |
|
|
955 | /* question: don't pick up known-poisonous stuff? */ |
1046 | if (!(op->contr->mode & PU_NEWMODE)) |
956 | if (op->contr->mode & PU_FOOD) |
|
|
957 | if (tmp->type == FOOD) |
1047 | { |
958 | { |
1048 | switch (op->contr->mode) |
959 | CHK_PICK_PICKUP; |
|
|
960 | continue; |
|
|
961 | } |
|
|
962 | |
|
|
963 | if (op->contr->mode & PU_DRINK) |
|
|
964 | if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) |
|
|
965 | { |
|
|
966 | CHK_PICK_PICKUP; |
|
|
967 | continue; |
|
|
968 | } |
|
|
969 | |
|
|
970 | if (op->contr->mode & PU_POTION) |
|
|
971 | if (tmp->type == POTION) |
|
|
972 | { |
|
|
973 | CHK_PICK_PICKUP; |
|
|
974 | continue; |
|
|
975 | } |
|
|
976 | |
|
|
977 | /* spellbooks, skillscrolls and normal books/scrolls */ |
|
|
978 | if (op->contr->mode & PU_SPELLBOOK) |
|
|
979 | if (tmp->type == SPELLBOOK) |
|
|
980 | { |
|
|
981 | CHK_PICK_PICKUP; |
|
|
982 | continue; |
|
|
983 | } |
|
|
984 | |
|
|
985 | if (op->contr->mode & PU_SKILLSCROLL) |
|
|
986 | if (tmp->type == SKILLSCROLL) |
|
|
987 | { |
|
|
988 | CHK_PICK_PICKUP; |
|
|
989 | continue; |
|
|
990 | } |
|
|
991 | |
|
|
992 | if (op->contr->mode & PU_READABLES) |
|
|
993 | if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE) |
|
|
994 | { |
|
|
995 | CHK_PICK_PICKUP; |
|
|
996 | continue; |
|
|
997 | } |
|
|
998 | |
|
|
999 | /* wands/staves/rods/horns */ |
|
|
1000 | if (op->contr->mode & PU_MAGIC_DEVICE) |
|
|
1001 | if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) |
|
|
1002 | { |
|
|
1003 | CHK_PICK_PICKUP; |
|
|
1004 | continue; |
|
|
1005 | } |
|
|
1006 | |
|
|
1007 | /* pick up all magical items */ |
|
|
1008 | if (op->contr->mode & PU_MAGICAL) |
|
|
1009 | if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) |
|
|
1010 | { |
|
|
1011 | CHK_PICK_PICKUP; |
|
|
1012 | continue; |
|
|
1013 | } |
|
|
1014 | |
|
|
1015 | if (op->contr->mode & PU_VALUABLES) |
|
|
1016 | { |
|
|
1017 | if (tmp->type == MONEY || tmp->type == GEM) |
1049 | { |
1018 | { |
1050 | case 0: |
|
|
1051 | return 1; /* don't pick up */ |
|
|
1052 | case 1: |
|
|
1053 | CHK_PICK_PICKUP; |
1019 | CHK_PICK_PICKUP; |
1054 | return 1; |
1020 | continue; |
1055 | case 2: |
|
|
1056 | CHK_PICK_PICKUP; |
|
|
1057 | return 0; |
|
|
1058 | case 3: |
|
|
1059 | return 0; /* stop before pickup */ |
|
|
1060 | case 4: |
|
|
1061 | CHK_PICK_PICKUP; |
|
|
1062 | break; |
|
|
1063 | case 5: |
|
|
1064 | CHK_PICK_PICKUP; |
|
|
1065 | stop = 1; |
|
|
1066 | break; |
|
|
1067 | case 6: |
|
|
1068 | if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) |
|
|
1069 | && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) |
|
|
1070 | CHK_PICK_PICKUP; |
|
|
1071 | break; |
|
|
1072 | |
|
|
1073 | case 7: |
|
|
1074 | if (tmp->type == MONEY || tmp->type == GEM) |
|
|
1075 | CHK_PICK_PICKUP; |
|
|
1076 | break; |
|
|
1077 | |
|
|
1078 | default: |
|
|
1079 | /* use value density */ |
|
|
1080 | if (!QUERY_FLAG (tmp, FLAG_UNPAID) |
|
|
1081 | && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode) |
|
|
1082 | CHK_PICK_PICKUP; |
|
|
1083 | } |
1021 | } |
1084 | } |
1022 | } |
1085 | else |
1023 | |
1086 | { /* old model */ |
1024 | /* rings & amulets - talismans seems to be typed AMULET */ |
1087 | /* NEW pickup handling */ |
|
|
1088 | if (op->contr->mode & PU_DEBUG) |
1025 | if (op->contr->mode & PU_JEWELS) |
|
|
1026 | if (tmp->type == RING || tmp->type == AMULET) |
1089 | { |
1027 | { |
1090 | /* some debugging code to figure out item information */ |
1028 | CHK_PICK_PICKUP; |
1091 | if (tmp->name != NULL) |
|
|
1092 | sprintf (putstring, "item name: %s item type: %d weight/value: %d", |
|
|
1093 | &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); |
|
|
1094 | else |
|
|
1095 | sprintf (putstring, "item name: %s item type: %d weight/value: %d", |
|
|
1096 | &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); |
|
|
1097 | |
|
|
1098 | new_draw_info (NDI_UNIQUE, 0, op, putstring); |
|
|
1099 | } |
|
|
1100 | |
|
|
1101 | /* philosophy: |
|
|
1102 | * It's easy to grab an item type from a pile, as long as it's |
|
|
1103 | * generic. This takes no game-time. For more detailed pickups |
|
|
1104 | * and selections, select-items should be used. This is a |
|
|
1105 | * grab-as-you-run type mode that's really useful for arrows for |
|
|
1106 | * example. |
|
|
1107 | * The drawback: right now it has no frontend, so you need to |
|
|
1108 | * stick the bits you want into a calculator in hex mode and then |
|
|
1109 | * convert to decimal and then 'pickup <#> |
|
|
1110 | */ |
|
|
1111 | |
|
|
1112 | /* the first two modes are exclusive: if NOTHING we return, if |
|
|
1113 | * STOP then we stop. All the rest are applied sequentially, |
|
|
1114 | * meaning if any test passes, the item gets picked up. */ |
|
|
1115 | |
|
|
1116 | /* if mode is set to pick nothing up, return */ |
|
|
1117 | |
|
|
1118 | if (op->contr->mode & PU_NOTHING) |
|
|
1119 | return 1; |
|
|
1120 | |
|
|
1121 | /* if mode is set to stop when encountering objects, return */ |
|
|
1122 | /* take STOP before INHIBIT since it doesn't actually pick |
|
|
1123 | * anything up */ |
|
|
1124 | |
|
|
1125 | if (op->contr->mode & PU_STOP) |
|
|
1126 | return 0; |
|
|
1127 | |
|
|
1128 | /* useful for going into stores and not losing your settings... */ |
|
|
1129 | /* and for battles wher you don't want to get loaded down while |
|
|
1130 | * fighting */ |
|
|
1131 | if (op->contr->mode & PU_INHIBIT) |
|
|
1132 | return 1; |
|
|
1133 | |
|
|
1134 | /* prevent us from turning into auto-thieves :) */ |
|
|
1135 | if (QUERY_FLAG (tmp, FLAG_UNPAID)) |
|
|
1136 | continue; |
1029 | continue; |
|
|
1030 | } |
1137 | |
1031 | |
1138 | /* ignore known cursed objects */ |
1032 | /* we don't forget dragon food */ |
1139 | if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED) |
1033 | if (op->contr->mode & PU_FLESH) |
|
|
1034 | if (tmp->type == FLESH) |
|
|
1035 | { |
|
|
1036 | CHK_PICK_PICKUP; |
1140 | continue; |
1037 | continue; |
|
|
1038 | } |
1141 | |
1039 | |
1142 | /* all food and drink if desired */ |
1040 | /* bows and arrows. Bows are good for selling! */ |
1143 | /* question: don't pick up known-poisonous stuff? */ |
1041 | if (op->contr->mode & PU_BOW) |
|
|
1042 | if (tmp->type == BOW) |
|
|
1043 | { |
|
|
1044 | CHK_PICK_PICKUP; |
|
|
1045 | continue; |
|
|
1046 | } |
|
|
1047 | |
|
|
1048 | if (op->contr->mode & PU_ARROW) |
|
|
1049 | if (tmp->type == ARROW) |
|
|
1050 | { |
|
|
1051 | CHK_PICK_PICKUP; |
|
|
1052 | continue; |
|
|
1053 | } |
|
|
1054 | |
|
|
1055 | /* all kinds of armor etc. */ |
|
|
1056 | if (op->contr->mode & PU_ARMOUR) |
|
|
1057 | if (tmp->type == ARMOUR) |
|
|
1058 | { |
|
|
1059 | CHK_PICK_PICKUP; |
|
|
1060 | continue; |
|
|
1061 | } |
|
|
1062 | |
|
|
1063 | if (op->contr->mode & PU_HELMET) |
|
|
1064 | if (tmp->type == HELMET) |
|
|
1065 | { |
|
|
1066 | CHK_PICK_PICKUP; |
|
|
1067 | continue; |
|
|
1068 | } |
|
|
1069 | |
|
|
1070 | if (op->contr->mode & PU_SHIELD) |
|
|
1071 | if (tmp->type == SHIELD) |
|
|
1072 | { |
|
|
1073 | CHK_PICK_PICKUP; |
|
|
1074 | continue; |
|
|
1075 | } |
|
|
1076 | |
1144 | if (op->contr->mode & PU_FOOD) |
1077 | if (op->contr->mode & PU_BOOTS) |
1145 | if (tmp->type == FOOD) |
1078 | if (tmp->type == BOOTS) |
|
|
1079 | { |
|
|
1080 | CHK_PICK_PICKUP; |
|
|
1081 | continue; |
|
|
1082 | } |
|
|
1083 | |
|
|
1084 | if (op->contr->mode & PU_GLOVES) |
|
|
1085 | if (tmp->type == GLOVES) |
|
|
1086 | { |
|
|
1087 | CHK_PICK_PICKUP; |
|
|
1088 | continue; |
|
|
1089 | } |
|
|
1090 | |
|
|
1091 | if (op->contr->mode & PU_CLOAK) |
|
|
1092 | if (tmp->type == CLOAK) |
|
|
1093 | { |
|
|
1094 | CHK_PICK_PICKUP; |
|
|
1095 | continue; |
|
|
1096 | } |
|
|
1097 | |
|
|
1098 | /* hoping to catch throwing daggers here */ |
|
|
1099 | if (op->contr->mode & PU_MISSILEWEAPON) |
|
|
1100 | if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN)) |
|
|
1101 | { |
|
|
1102 | CHK_PICK_PICKUP; |
|
|
1103 | continue; |
|
|
1104 | } |
|
|
1105 | |
|
|
1106 | /* careful: chairs and tables are weapons! */ |
|
|
1107 | if (op->contr->mode & PU_ALLWEAPON) |
|
|
1108 | { |
|
|
1109 | if (tmp->type == WEAPON) |
|
|
1110 | if (!tmp->arch->archname.contains ("table") && !tmp->arch->archname.contains ("chair")) |
1146 | { |
1111 | { |
1147 | CHK_PICK_PICKUP; |
1112 | CHK_PICK_PICKUP; |
1148 | continue; |
1113 | continue; |
1149 | } |
1114 | } |
|
|
1115 | } |
1150 | |
1116 | |
|
|
1117 | /* misc stuff that's useful */ |
1151 | if (op->contr->mode & PU_DRINK) |
1118 | if (op->contr->mode & PU_KEY) |
1152 | if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) |
1119 | if (tmp->type == KEY || tmp->type == SPECIAL_KEY) |
1153 | { |
1120 | { |
1154 | CHK_PICK_PICKUP; |
1121 | CHK_PICK_PICKUP; |
1155 | continue; |
1122 | continue; |
1156 | } |
1123 | } |
1157 | |
1124 | |
|
|
1125 | /* any of the last 4 bits set means we use the ratio for value |
|
|
1126 | * pickups */ |
1158 | if (op->contr->mode & PU_POTION) |
1127 | if (op->contr->mode & PU_RATIO) |
1159 | if (tmp->type == POTION) |
1128 | { |
|
|
1129 | /* use value density to decide what else to grab */ |
|
|
1130 | /* >=7 was >= op->contr->mode */ |
|
|
1131 | /* >=7 is the old standard setting. Now we take the last 4 bits |
1160 | { |
1132 | */ |
1161 | CHK_PICK_PICKUP; |
|
|
1162 | continue; |
|
|
1163 | } |
|
|
1164 | |
|
|
1165 | /* spellbooks, skillscrolls and normal books/scrolls */ |
|
|
1166 | if (op->contr->mode & PU_SPELLBOOK) |
|
|
1167 | if (tmp->type == SPELLBOOK) |
|
|
1168 | { |
|
|
1169 | CHK_PICK_PICKUP; |
|
|
1170 | continue; |
|
|
1171 | } |
|
|
1172 | |
|
|
1173 | if (op->contr->mode & PU_SKILLSCROLL) |
|
|
1174 | if (tmp->type == SKILLSCROLL) |
|
|
1175 | { |
|
|
1176 | CHK_PICK_PICKUP; |
|
|
1177 | continue; |
|
|
1178 | } |
|
|
1179 | |
|
|
1180 | if (op->contr->mode & PU_READABLES) |
|
|
1181 | if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE) |
|
|
1182 | { |
|
|
1183 | CHK_PICK_PICKUP; |
|
|
1184 | continue; |
|
|
1185 | } |
|
|
1186 | |
|
|
1187 | /* wands/staves/rods/horns */ |
|
|
1188 | if (op->contr->mode & PU_MAGIC_DEVICE) |
|
|
1189 | if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) |
|
|
1190 | { |
|
|
1191 | CHK_PICK_PICKUP; |
|
|
1192 | continue; |
|
|
1193 | } |
|
|
1194 | |
|
|
1195 | /* pick up all magical items */ |
|
|
1196 | if (op->contr->mode & PU_MAGICAL) |
1133 | wvratio = op->contr->mode & PU_RATIO; |
1197 | if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) |
1134 | if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100) |
1198 | { |
|
|
1199 | CHK_PICK_PICKUP; |
|
|
1200 | continue; |
|
|
1201 | } |
|
|
1202 | |
|
|
1203 | if (op->contr->mode & PU_VALUABLES) |
|
|
1204 | { |
1135 | { |
1205 | if (tmp->type == MONEY || tmp->type == GEM) |
1136 | #if 0 |
|
|
1137 | fprintf (stderr, "HIGH WEIGHT/VALUE ["); |
|
|
1138 | if (tmp->name != NULL) |
1206 | { |
1139 | { |
1207 | CHK_PICK_PICKUP; |
1140 | fprintf (stderr, "%s", tmp->name); |
1208 | continue; |
|
|
1209 | } |
1141 | } |
1210 | } |
|
|
1211 | |
|
|
1212 | /* rings & amulets - talismans seems to be typed AMULET */ |
|
|
1213 | if (op->contr->mode & PU_JEWELS) |
|
|
1214 | if (tmp->type == RING || tmp->type == AMULET) |
|
|
1215 | { |
|
|
1216 | CHK_PICK_PICKUP; |
|
|
1217 | continue; |
|
|
1218 | } |
|
|
1219 | |
|
|
1220 | /* we don't forget dragon food */ |
|
|
1221 | if (op->contr->mode & PU_FLESH) |
|
|
1222 | if (tmp->type == FLESH) |
|
|
1223 | { |
|
|
1224 | CHK_PICK_PICKUP; |
|
|
1225 | continue; |
|
|
1226 | } |
|
|
1227 | |
|
|
1228 | /* bows and arrows. Bows are good for selling! */ |
|
|
1229 | if (op->contr->mode & PU_BOW) |
|
|
1230 | if (tmp->type == BOW) |
|
|
1231 | { |
|
|
1232 | CHK_PICK_PICKUP; |
|
|
1233 | continue; |
|
|
1234 | } |
|
|
1235 | |
|
|
1236 | if (op->contr->mode & PU_ARROW) |
|
|
1237 | if (tmp->type == ARROW) |
|
|
1238 | { |
|
|
1239 | CHK_PICK_PICKUP; |
|
|
1240 | continue; |
|
|
1241 | } |
|
|
1242 | |
|
|
1243 | /* all kinds of armor etc. */ |
|
|
1244 | if (op->contr->mode & PU_ARMOUR) |
|
|
1245 | if (tmp->type == ARMOUR) |
|
|
1246 | { |
|
|
1247 | CHK_PICK_PICKUP; |
|
|
1248 | continue; |
|
|
1249 | } |
|
|
1250 | |
|
|
1251 | if (op->contr->mode & PU_HELMET) |
|
|
1252 | if (tmp->type == HELMET) |
|
|
1253 | { |
|
|
1254 | CHK_PICK_PICKUP; |
|
|
1255 | continue; |
|
|
1256 | } |
|
|
1257 | |
|
|
1258 | if (op->contr->mode & PU_SHIELD) |
|
|
1259 | if (tmp->type == SHIELD) |
|
|
1260 | { |
|
|
1261 | CHK_PICK_PICKUP; |
|
|
1262 | continue; |
|
|
1263 | } |
|
|
1264 | |
|
|
1265 | if (op->contr->mode & PU_BOOTS) |
|
|
1266 | if (tmp->type == BOOTS) |
|
|
1267 | { |
|
|
1268 | CHK_PICK_PICKUP; |
|
|
1269 | continue; |
|
|
1270 | } |
|
|
1271 | |
|
|
1272 | if (op->contr->mode & PU_GLOVES) |
|
|
1273 | if (tmp->type == GLOVES) |
|
|
1274 | { |
|
|
1275 | CHK_PICK_PICKUP; |
|
|
1276 | continue; |
|
|
1277 | } |
|
|
1278 | |
|
|
1279 | if (op->contr->mode & PU_CLOAK) |
|
|
1280 | if (tmp->type == CLOAK) |
|
|
1281 | { |
|
|
1282 | CHK_PICK_PICKUP; |
|
|
1283 | continue; |
|
|
1284 | } |
|
|
1285 | |
|
|
1286 | /* hoping to catch throwing daggers here */ |
|
|
1287 | if (op->contr->mode & PU_MISSILEWEAPON) |
|
|
1288 | if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN)) |
|
|
1289 | { |
|
|
1290 | CHK_PICK_PICKUP; |
|
|
1291 | continue; |
|
|
1292 | } |
|
|
1293 | |
|
|
1294 | /* careful: chairs and tables are weapons! */ |
|
|
1295 | if (op->contr->mode & PU_ALLWEAPON) |
|
|
1296 | { |
|
|
1297 | if (tmp->type == WEAPON && tmp->name != NULL) |
|
|
1298 | { |
|
|
1299 | if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL && |
|
|
1300 | strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL) |
|
|
1301 | { |
|
|
1302 | CHK_PICK_PICKUP; |
|
|
1303 | continue; |
|
|
1304 | } |
|
|
1305 | } |
|
|
1306 | |
|
|
1307 | if (tmp->type == WEAPON && tmp->name == NULL) |
|
|
1308 | { |
|
|
1309 | if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL) |
|
|
1310 | { |
|
|
1311 | CHK_PICK_PICKUP; |
|
|
1312 | continue; |
|
|
1313 | } |
|
|
1314 | } |
|
|
1315 | } |
|
|
1316 | |
|
|
1317 | /* misc stuff that's useful */ |
|
|
1318 | if (op->contr->mode & PU_KEY) |
|
|
1319 | if (tmp->type == KEY || tmp->type == SPECIAL_KEY) |
|
|
1320 | { |
|
|
1321 | CHK_PICK_PICKUP; |
|
|
1322 | continue; |
|
|
1323 | } |
|
|
1324 | |
|
|
1325 | /* any of the last 4 bits set means we use the ratio for value |
|
|
1326 | * pickups */ |
|
|
1327 | if (op->contr->mode & PU_RATIO) |
|
|
1328 | { |
|
|
1329 | /* use value density to decide what else to grab */ |
|
|
1330 | /* >=7 was >= op->contr->mode */ |
|
|
1331 | /* >=7 is the old standard setting. Now we take the last 4 bits |
|
|
1332 | * and multiply them by 5, giving 0..15*5== 5..75 */ |
|
|
1333 | wvratio = (op->contr->mode & PU_RATIO) * 5; |
|
|
1334 | if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio) |
|
|
1335 | { |
|
|
1336 | CHK_PICK_PICKUP; |
|
|
1337 | #if 0 |
|
|
1338 | fprintf (stderr, "HIGH WEIGHT/VALUE ["); |
|
|
1339 | if (tmp->name != NULL) |
|
|
1340 | { |
|
|
1341 | fprintf (stderr, "%s", tmp->name); |
|
|
1342 | } |
|
|
1343 | else |
1142 | else |
1344 | fprintf (stderr, "%s", tmp->arch->archname); |
1143 | fprintf (stderr, "%s", tmp->arch->archname); |
1345 | fprintf (stderr, ",%d] = ", tmp->type); |
1144 | fprintf (stderr, ",%d] = ", tmp->type); |
1346 | fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); |
1145 | fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); |
1347 | #endif |
1146 | #endif |
|
|
1147 | CHK_PICK_PICKUP; |
1348 | continue; |
1148 | continue; |
1349 | } |
|
|
1350 | } |
1149 | } |
1351 | } /* the new pickup model */ |
1150 | } /* the new pickup model */ |
1352 | } |
1151 | } |
1353 | |
1152 | |
1354 | return !stop; |
1153 | return !stop; |
… | |
… | |
1382 | * against the target. A full test is not performed, simply a basic test |
1181 | * against the target. A full test is not performed, simply a basic test |
1383 | * of resistances. The archer is making a quick guess at what he sees down |
1182 | * of resistances. The archer is making a quick guess at what he sees down |
1384 | * the hall. Failing that it does it's best to pick the highest plus arrow. |
1183 | * the hall. Failing that it does it's best to pick the highest plus arrow. |
1385 | */ |
1184 | */ |
1386 | object * |
1185 | object * |
1387 | find_better_arrow (object *op, object *target, const char *type, int *better) |
1186 | find_better_arrow (object *op, object *target, shstr_cmp type, int *better) |
1388 | { |
1187 | { |
1389 | object *tmp = NULL, *arrow, *ntmp; |
1188 | object *tmp = NULL, *arrow, *ntmp; |
1390 | int attacknum, attacktype, betterby = 0, i; |
1189 | int attacknum, attacktype, betterby = 0, i; |
1391 | |
1190 | |
1392 | if (!type) |
1191 | if (!type) |
… | |
… | |
1396 | { |
1195 | { |
1397 | if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED)) |
1196 | if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED)) |
1398 | { |
1197 | { |
1399 | i = 0; |
1198 | i = 0; |
1400 | ntmp = find_better_arrow (arrow, target, type, &i); |
1199 | ntmp = find_better_arrow (arrow, target, type, &i); |
|
|
1200 | |
1401 | if (i > betterby) |
1201 | if (i > betterby) |
1402 | { |
1202 | { |
1403 | tmp = ntmp; |
1203 | tmp = ntmp; |
1404 | betterby = i; |
1204 | betterby = i; |
1405 | } |
1205 | } |
1406 | } |
1206 | } |
1407 | else if (arrow->type == ARROW && arrow->race == type) |
1207 | else if (arrow->type == ARROW && arrow->race == type) |
1408 | { |
1208 | { |
1409 | /* allways prefer assasination/slaying */ |
1209 | /* allways prefer assasination/slaying */ |
1410 | if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race)) |
1210 | if (target->race && arrow->slaying.contains (target->race)) |
1411 | { |
1211 | { |
1412 | if (arrow->attacktype & AT_DEATH) |
1212 | if (arrow->attacktype & AT_DEATH) |
1413 | { |
1213 | { |
1414 | *better = 100; |
1214 | *better = 100; |
1415 | return arrow; |
1215 | return arrow; |
… | |
… | |
1430 | { |
1230 | { |
1431 | tmp = arrow; |
1231 | tmp = arrow; |
1432 | betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100; |
1232 | betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100; |
1433 | } |
1233 | } |
1434 | } |
1234 | } |
|
|
1235 | |
1435 | if ((2 + arrow->magic + arrow->stats.dam) > betterby) |
1236 | if ((2 + arrow->magic + arrow->stats.dam) > betterby) |
1436 | { |
1237 | { |
1437 | tmp = arrow; |
1238 | tmp = arrow; |
1438 | betterby = 2 + arrow->magic + arrow->stats.dam; |
1239 | betterby = 2 + arrow->magic + arrow->stats.dam; |
1439 | } |
1240 | } |
|
|
1241 | |
1440 | if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby) |
1242 | if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby) |
1441 | { |
1243 | { |
1442 | tmp = arrow; |
1244 | tmp = arrow; |
1443 | betterby = 1 + arrow->magic + arrow->stats.dam; |
1245 | betterby = 1 + arrow->magic + arrow->stats.dam; |
1444 | } |
1246 | } |
1445 | } |
1247 | } |
1446 | } |
1248 | } |
1447 | } |
1249 | } |
|
|
1250 | |
1448 | if (tmp == NULL && arrow == NULL) |
1251 | if (tmp == NULL && arrow == NULL) |
1449 | return find_arrow (op, type); |
1252 | return find_arrow (op, type); |
1450 | |
1253 | |
1451 | *better = betterby; |
1254 | *better = betterby; |
1452 | return tmp; |
1255 | return tmp; |
… | |
… | |
1457 | * op = the shooter |
1260 | * op = the shooter |
1458 | * type = bow->race |
1261 | * type = bow->race |
1459 | * dir = fire direction |
1262 | * dir = fire direction |
1460 | */ |
1263 | */ |
1461 | object * |
1264 | object * |
1462 | pick_arrow_target (object *op, const char *type, int dir) |
1265 | pick_arrow_target (object *op, shstr_cmp type, int dir) |
1463 | { |
1266 | { |
1464 | object *tmp = NULL; |
1267 | object *tmp = NULL; |
1465 | maptile *m; |
1268 | maptile *m; |
1466 | int i, mflags, found, number; |
1269 | int i, mflags, found, number; |
1467 | sint16 x, y; |
1270 | sint16 x, y; |
… | |
… | |
1482 | for (i = 0, found = 0; i < 20; i++) |
1285 | for (i = 0, found = 0; i < 20; i++) |
1483 | { |
1286 | { |
1484 | x += freearr_x[dir]; |
1287 | x += freearr_x[dir]; |
1485 | y += freearr_y[dir]; |
1288 | y += freearr_y[dir]; |
1486 | mflags = get_map_flags (m, &m, x, y, &x, &y); |
1289 | mflags = get_map_flags (m, &m, x, y, &x, &y); |
|
|
1290 | |
1487 | if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW) |
1291 | if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW) |
1488 | { |
1292 | { |
1489 | tmp = NULL; |
1293 | tmp = 0; |
1490 | break; |
1294 | break; |
1491 | } |
1295 | } |
1492 | else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW) |
1296 | else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW) |
1493 | { |
1297 | { |
1494 | /* This block presumes arrows and the like are MOVE_FLY_SLOW - |
1298 | /* This block presumes arrows and the like are MOVE_FLY_SLOW - |
1495 | * perhaps a bad assumption. |
1299 | * perhaps a bad assumption. |
1496 | */ |
1300 | */ |
1497 | tmp = NULL; |
1301 | tmp = 0; |
1498 | break; |
1302 | break; |
1499 | } |
1303 | } |
|
|
1304 | |
1500 | if (mflags & P_IS_ALIVE) |
1305 | if (mflags & P_IS_ALIVE) |
1501 | { |
|
|
1502 | for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) |
1306 | for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) |
1503 | if (QUERY_FLAG (tmp, FLAG_ALIVE)) |
1307 | if (QUERY_FLAG (tmp, FLAG_ALIVE)) |
1504 | { |
|
|
1505 | found++; |
|
|
1506 | break; |
|
|
1507 | } |
|
|
1508 | if (found) |
|
|
1509 | break; |
1308 | break; |
1510 | } |
|
|
1511 | } |
1309 | } |
1512 | if (tmp == NULL) |
1310 | |
|
|
1311 | if (!tmp) |
1513 | return find_arrow (op, type); |
1312 | return find_arrow (op, type); |
1514 | |
1313 | |
1515 | if (tmp->head) |
1314 | if (tmp->head) |
1516 | tmp = tmp->head; |
1315 | tmp = tmp->head; |
1517 | |
1316 | |
… | |
… | |
1557 | LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); |
1356 | LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); |
1558 | return 0; |
1357 | return 0; |
1559 | } |
1358 | } |
1560 | |
1359 | |
1561 | // optimisation: move object to top so we will find it quickly again |
1360 | // optimisation: move object to top so we will find it quickly again |
1562 | if (bow->below) |
1361 | splay (bow); |
1563 | { |
|
|
1564 | bow->remove (); |
|
|
1565 | op->insert (bow); |
|
|
1566 | } |
|
|
1567 | |
|
|
1568 | } |
1362 | } |
1569 | |
1363 | |
1570 | if (!bow->race || !bow->skill) |
1364 | if (!bow->race || !bow->skill) |
1571 | { |
1365 | { |
1572 | new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); |
1366 | new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); |
… | |
… | |
1598 | } |
1392 | } |
1599 | |
1393 | |
1600 | /* this should not happen, but sometimes does */ |
1394 | /* this should not happen, but sometimes does */ |
1601 | if (arrow->nrof == 0) |
1395 | if (arrow->nrof == 0) |
1602 | { |
1396 | { |
|
|
1397 | LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ()); |
1603 | arrow->destroy (); |
1398 | arrow->destroy (); |
1604 | return 0; |
1399 | return 0; |
1605 | } |
1400 | } |
1606 | |
1401 | |
1607 | left = arrow; /* these are arrows left to the player */ |
1402 | left = arrow; /* these are arrows left to the player */ |
… | |
… | |
1617 | arrow->direction = dir; |
1412 | arrow->direction = dir; |
1618 | |
1413 | |
1619 | arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */ |
1414 | arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */ |
1620 | arrow->stats.hp = arrow->stats.dam; |
1415 | arrow->stats.hp = arrow->stats.dam; |
1621 | arrow->stats.grace = arrow->attacktype; |
1416 | arrow->stats.grace = arrow->attacktype; |
1622 | |
1417 | arrow->custom_name = arrow->slaying; |
1623 | if (arrow->slaying) |
|
|
1624 | arrow->spellarg = strdup (arrow->slaying); |
|
|
1625 | |
1418 | |
1626 | #if 0 |
1419 | #if 0 |
1627 | if (player *pl = op->contr) |
1420 | if (player *pl = op->contr) |
1628 | { |
1421 | { |
1629 | float speed = pl->weapon_sp; |
1422 | float speed = pl->weapon_sp; |
… | |
… | |
1694 | * hence the function name. |
1487 | * hence the function name. |
1695 | */ |
1488 | */ |
1696 | int |
1489 | int |
1697 | player_fire_bow (object *op, int dir) |
1490 | player_fire_bow (object *op, int dir) |
1698 | { |
1491 | { |
1699 | int ret = 0, wcmod = 0; |
1492 | int ret; |
1700 | |
1493 | |
1701 | if (op->contr->bowtype == bow_bestarrow) |
1494 | if (op->contr->bowtype == bow_bestarrow) |
1702 | { |
1495 | { |
1703 | ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y); |
1496 | ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y); |
1704 | } |
1497 | } |
1705 | else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) |
1498 | else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) |
1706 | { |
1499 | { |
1707 | if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) |
1500 | int wcmod = similar_direction (dir, op->contr->bowtype - bow_n + 1) ? 0 : -1; |
1708 | wcmod = -1; |
|
|
1709 | |
|
|
1710 | ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); |
1501 | ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); |
1711 | } |
1502 | } |
1712 | else if (op->contr->bowtype == bow_threewide) |
1503 | else if (op->contr->bowtype == bow_threewide) |
1713 | { |
1504 | { |
1714 | ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); |
1505 | ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); |
1715 | ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]); |
1506 | ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]); |
1716 | ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]); |
1507 | ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]); |
1717 | } |
1508 | } |
1718 | else if (op->contr->bowtype == bow_spreadshot) |
1509 | else if (op->contr->bowtype == bow_spreadshot) |
1719 | { |
1510 | { |
1720 | ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); |
1511 | ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); |
1721 | ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); |
1512 | ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); |
1722 | ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); |
1513 | ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); |
1723 | } |
1514 | } |
1724 | else |
1515 | else |
1725 | { |
1516 | { |
… | |
… | |
1763 | return; |
1554 | return; |
1764 | } |
1555 | } |
1765 | } |
1556 | } |
1766 | else if (item->type == ROD || item->type == HORN) |
1557 | else if (item->type == ROD || item->type == HORN) |
1767 | { |
1558 | { |
1768 | if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) |
1559 | sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace); |
|
|
1560 | |
|
|
1561 | // using the maximum of the rods charge allows at least one spell cast |
|
|
1562 | // for a rod or horn, this fixes some broken rods. |
|
|
1563 | if (item->stats.hp < MIN (spell_sp, item->stats.maxhp)) |
1769 | { |
1564 | { |
1770 | op->contr->play_sound (sound_find ("wand_poof")); |
1565 | op->contr->play_sound (sound_find ("wand_poof")); |
1771 | |
1566 | |
1772 | if (item->type == ROD) |
1567 | if (item->type == ROD) |
1773 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); |
1568 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); |
… | |
… | |
1778 | } |
1573 | } |
1779 | } |
1574 | } |
1780 | |
1575 | |
1781 | if (cast_spell (op, item, dir, item->inv, NULL)) |
1576 | if (cast_spell (op, item, dir, item->inv, NULL)) |
1782 | { |
1577 | { |
1783 | SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */ |
1578 | item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */ |
|
|
1579 | |
1784 | if (item->type == WAND) |
1580 | if (item->type == WAND) |
1785 | { |
1581 | { |
1786 | if (!(--item->stats.food)) |
1582 | if (!(--item->stats.food)) |
1787 | { |
1583 | { |
1788 | object *tmp; |
1584 | object *tmp; |
… | |
… | |
1792 | CLEAR_FLAG (item, FLAG_ANIMATE); |
1588 | CLEAR_FLAG (item, FLAG_ANIMATE); |
1793 | item->face = item->arch->face; |
1589 | item->face = item->arch->face; |
1794 | item->set_speed (0); |
1590 | item->set_speed (0); |
1795 | } |
1591 | } |
1796 | |
1592 | |
1797 | if ((tmp = item->in_player ())) |
1593 | if (object *pl = item->visible_to ()) |
1798 | esrv_update_item (UPD_ANIM, tmp, item); |
1594 | esrv_update_item (UPD_ANIM, pl, item); |
1799 | } |
1595 | } |
1800 | } |
1596 | } |
1801 | else if (item->type == ROD || item->type == HORN) |
1597 | else if (item->type == ROD || item->type == HORN) |
1802 | drain_rod_charge (item); |
1598 | drain_rod_charge (item); |
1803 | } |
1599 | } |
… | |
… | |
1808 | bool |
1604 | bool |
1809 | fire (object *op, int dir) |
1605 | fire (object *op, int dir) |
1810 | { |
1606 | { |
1811 | int spellcost = 0; |
1607 | int spellcost = 0; |
1812 | |
1608 | |
1813 | /* check for loss of invisiblity/hide */ |
|
|
1814 | if (action_makes_visible (op)) |
|
|
1815 | make_visible (op); |
|
|
1816 | |
|
|
1817 | player *pl = op->contr; |
1609 | player *pl = op->contr; |
1818 | |
1610 | |
1819 | if (pl->golem) |
1611 | if (pl->golem) |
1820 | { |
1612 | { |
1821 | control_golem (op->contr->golem, dir); |
1613 | control_golem (op->contr->golem, dir); |
… | |
… | |
1823 | } |
1615 | } |
1824 | |
1616 | |
1825 | object *ob = pl->ranged_ob; |
1617 | object *ob = pl->ranged_ob; |
1826 | |
1618 | |
1827 | if (!ob) |
1619 | if (!ob) |
1828 | return false; |
|
|
1829 | |
|
|
1830 | if (!op->change_weapon (ob)) |
|
|
1831 | return false; |
1620 | return false; |
1832 | |
1621 | |
1833 | if (op->speed_left > 0.f) |
1622 | if (op->speed_left > 0.f) |
1834 | --op->speed_left; |
1623 | --op->speed_left; |
1835 | else |
1624 | else |
1836 | return false; |
1625 | return false; |
1837 | |
1626 | |
|
|
1627 | if (!op->change_weapon (ob)) |
|
|
1628 | return false; |
|
|
1629 | |
|
|
1630 | /* check for loss of invisiblity/hide */ |
|
|
1631 | if (action_makes_visible (op)) |
|
|
1632 | make_visible (op); |
|
|
1633 | |
1838 | switch (ob->type) |
1634 | switch (ob->type) |
1839 | { |
1635 | { |
1840 | case BOW: |
1636 | case BOW: |
1841 | player_fire_bow (op, dir); |
1637 | player_fire_bow (op, dir); |
1842 | break; |
1638 | break; |
1843 | |
1639 | |
1844 | case SPELL: |
1640 | case SPELL: |
1845 | spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0); |
1641 | spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0); |
1846 | break; |
1642 | break; |
1847 | |
1643 | |
1848 | case BUILDER: |
1644 | case BUILDER: |
1849 | apply_map_builder (op, dir); |
1645 | apply_map_builder (op, dir); |
1850 | break; |
1646 | break; |
… | |
… | |
1883 | /* First, lets try to find a key in the top level inventory */ |
1679 | /* First, lets try to find a key in the top level inventory */ |
1884 | for (tmp = container->inv; tmp; tmp = tmp->below) |
1680 | for (tmp = container->inv; tmp; tmp = tmp->below) |
1885 | { |
1681 | { |
1886 | if (door->type == DOOR && tmp->type == KEY) |
1682 | if (door->type == DOOR && tmp->type == KEY) |
1887 | break; |
1683 | break; |
|
|
1684 | |
1888 | /* For sanity, we should really check door type, but other stuff |
1685 | /* For sanity, we should really check door type, but other stuff |
1889 | * (like containers) can be locked with special keys |
1686 | * (like containers) can be locked with special keys |
1890 | */ |
1687 | */ |
1891 | if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) |
1688 | if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) |
1892 | break; |
1689 | break; |
… | |
… | |
1898 | * a key, return |
1695 | * a key, return |
1899 | */ |
1696 | */ |
1900 | if (!tmp) |
1697 | if (!tmp) |
1901 | { |
1698 | { |
1902 | for (tmp = container->inv; tmp; tmp = tmp->below) |
1699 | for (tmp = container->inv; tmp; tmp = tmp->below) |
1903 | { |
|
|
1904 | /* No reason to search empty containers */ |
1700 | /* No reason to search empty containers */ |
1905 | if (tmp->type == CONTAINER && tmp->inv) |
1701 | if (tmp->type == CONTAINER && tmp->inv) |
1906 | { |
|
|
1907 | if ((key = find_key (pl, tmp, door))) |
1702 | if ((key = find_key (pl, tmp, door))) |
1908 | return key; |
1703 | return key; |
1909 | } |
|
|
1910 | } |
|
|
1911 | |
1704 | |
1912 | if (!tmp) |
1705 | if (!tmp) |
1913 | return NULL; |
1706 | return 0; |
1914 | } |
1707 | } |
1915 | |
1708 | |
1916 | /* We get down here if we have found a key. Now if its in a container, |
1709 | /* We get down here if we have found a key. Now if its in a container, |
1917 | * see if we actually want to use it |
1710 | * see if we actually want to use it |
1918 | */ |
1711 | */ |
1919 | if (pl != container) |
1712 | if (pl != container) |
1920 | { |
1713 | { |
1921 | /* Only let players use keys in containers */ |
1714 | /* Only let players use keys in containers */ |
1922 | if (!pl->contr) |
1715 | if (!pl->contr) |
1923 | return NULL; |
1716 | return 0; |
|
|
1717 | |
1924 | /* cases where this fails: |
1718 | /* cases where this fails: |
1925 | * If we only search the player inventory, return now since we |
1719 | * If we only search the player inventory, return now since we |
1926 | * are not in the players inventory. |
1720 | * are not in the players inventory. |
1927 | * If the container is not active, return now since only active |
1721 | * If the container is not active, return now since only active |
1928 | * containers can be used. |
1722 | * containers can be used. |
… | |
… | |
1932 | * inv must have been an container and must have been active. |
1726 | * inv must have been an container and must have been active. |
1933 | * |
1727 | * |
1934 | * Change the color so that the message doesn't disappear with |
1728 | * Change the color so that the message doesn't disappear with |
1935 | * all the others. |
1729 | * all the others. |
1936 | */ |
1730 | */ |
1937 | if (pl->contr->usekeys == key_inventory || |
1731 | if (pl->contr->usekeys == key_inventory |
1938 | !QUERY_FLAG (container, FLAG_APPLIED) || |
1732 | || !QUERY_FLAG (container, FLAG_APPLIED) |
1939 | (pl->contr->usekeys == keyrings && (!container->race || strcmp (container->race, "keys")))) |
1733 | || (pl->contr->usekeys == keyrings && container->race != shstr_keys)) |
1940 | { |
1734 | { |
1941 | new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, |
1735 | new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, |
1942 | "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); |
1736 | "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); |
1943 | return NULL; |
1737 | return NULL; |
1944 | } |
1738 | } |
… | |
… | |
1957 | { |
1751 | { |
1958 | /* If its a door, try to find a key. If we do destroy the door, |
1752 | /* If its a door, try to find a key. If we do destroy the door, |
1959 | * might as well return immediately as there is nothing more to do - |
1753 | * might as well return immediately as there is nothing more to do - |
1960 | * otherwise, we fall through to the rest of the code. |
1754 | * otherwise, we fall through to the rest of the code. |
1961 | */ |
1755 | */ |
|
|
1756 | object *key; |
|
|
1757 | |
|
|
1758 | if (door->slaying && is_match_expr (door->slaying)) |
|
|
1759 | { |
|
|
1760 | // for match expressions, we try to find the key by applying the match |
|
|
1761 | // to the op itself, which is supposed to find the "key", instead |
|
|
1762 | // of searching through containers ourselves. |
|
|
1763 | |
|
|
1764 | key = match_one (door->slaying, op, door, op, op); |
|
|
1765 | } |
|
|
1766 | else |
1962 | object *key = find_key (op, op, door); |
1767 | key = find_key (op, op, door); |
1963 | |
1768 | |
1964 | /* If we found a key, do some extra work */ |
1769 | /* If we found a key, do some extra work */ |
1965 | if (key) |
1770 | if (key) |
1966 | { |
1771 | { |
1967 | object *container = key->env; |
1772 | object *container = key->env; |
… | |
… | |
1980 | remove_door2 (door); /* remove door without violence ;-) */ |
1785 | remove_door2 (door); /* remove door without violence ;-) */ |
1981 | } |
1786 | } |
1982 | |
1787 | |
1983 | /* Do this after we print the message */ |
1788 | /* Do this after we print the message */ |
1984 | key->decrease (); /* Use up one of the keys */ |
1789 | key->decrease (); /* Use up one of the keys */ |
1985 | /* Need to update the weight the container the key was in */ |
|
|
1986 | if (container != op) |
|
|
1987 | esrv_update_item (UPD_WEIGHT, op, container); |
|
|
1988 | |
1790 | |
1989 | return 1; /* Nothing more to do below */ |
1791 | return 1; /* Nothing more to do below */ |
1990 | } |
1792 | } |
1991 | else if (door->type == LOCKED_DOOR) |
1793 | else if (door->type == LOCKED_DOOR) |
1992 | { |
1794 | { |
… | |
… | |
2005 | * going to try and move (not fire weapons). |
1807 | * going to try and move (not fire weapons). |
2006 | */ |
1808 | */ |
2007 | bool |
1809 | bool |
2008 | move_player_attack (object *op, int dir) |
1810 | move_player_attack (object *op, int dir) |
2009 | { |
1811 | { |
|
|
1812 | if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op)) |
|
|
1813 | { |
|
|
1814 | --op->speed_left; |
|
|
1815 | return true; |
|
|
1816 | } |
|
|
1817 | |
2010 | int on_battleground; |
1818 | int on_battleground; |
2011 | |
1819 | |
2012 | sint16 nx = freearr_x[dir] + op->x; |
1820 | sint16 nx = freearr_x[dir] + op->x; |
2013 | sint16 ny = freearr_y[dir] + op->y; |
1821 | sint16 ny = freearr_y[dir] + op->y; |
2014 | |
1822 | |
2015 | on_battleground = op_on_battleground (op, 0, 0); |
1823 | on_battleground = op_on_battleground (op, 0, 0); |
2016 | |
1824 | |
2017 | if (out_of_map (op->map, nx, ny)) |
1825 | if (out_of_map (op->map, nx, ny)) |
2018 | return false; |
1826 | return false; |
2019 | |
|
|
2020 | if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op)) |
|
|
2021 | { |
|
|
2022 | --op->speed_left; |
|
|
2023 | return true; |
|
|
2024 | } |
|
|
2025 | |
1827 | |
2026 | /* If braced, or can't move to the square, and it is not out of the |
1828 | /* If braced, or can't move to the square, and it is not out of the |
2027 | * map, attack it. Note order of if statement is important - don't |
1829 | * map, attack it. Note order of if statement is important - don't |
2028 | * want to be calling move_ob if braced, because move_ob will move the |
1830 | * want to be calling move_ob if braced, because move_ob will move the |
2029 | * player. This is a pretty nasty hack, because if we could |
1831 | * player. This is a pretty nasty hack, because if we could |
… | |
… | |
2089 | --op->speed_left; |
1891 | --op->speed_left; |
2090 | |
1892 | |
2091 | op->play_sound (sound_find ("push_player")); |
1893 | op->play_sound (sound_find ("push_player")); |
2092 | push_ob (mon, dir, op); |
1894 | push_ob (mon, dir, op); |
2093 | |
1895 | |
2094 | if (op->contr->tmp_invis || op->hide) |
1896 | if (action_makes_visible (op)) |
2095 | make_visible (op); |
1897 | make_visible (op); |
2096 | |
1898 | |
2097 | return true; |
1899 | return true; |
2098 | } |
1900 | } |
2099 | else |
1901 | else |
… | |
… | |
2121 | push_ob (mon, dir, op); |
1923 | push_ob (mon, dir, op); |
2122 | } |
1924 | } |
2123 | else |
1925 | else |
2124 | op->statusmsg ("You withhold your attack"); |
1926 | op->statusmsg ("You withhold your attack"); |
2125 | |
1927 | |
2126 | if (op->contr->tmp_invis || op->hide) |
1928 | if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN]) |
2127 | make_visible (op); |
1929 | make_visible (op); |
2128 | |
1930 | |
2129 | return true; |
1931 | return true; |
2130 | } |
1932 | } |
2131 | } |
1933 | } |
… | |
… | |
2189 | if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) |
1991 | if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) |
2190 | dir = absdir (dir + rndm (3) + rndm (3) - 2); |
1992 | dir = absdir (dir + rndm (3) + rndm (3) - 2); |
2191 | |
1993 | |
2192 | op->facing = dir; |
1994 | op->facing = dir; |
2193 | |
1995 | |
2194 | if (op->hide) |
1996 | if (op->flag [FLAG_HIDDEN]) |
2195 | do_hidden_move (op); |
1997 | do_hidden_move (op); |
2196 | |
1998 | |
2197 | bool retval; |
1999 | bool retval; |
2198 | |
2000 | |
2199 | if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) |
2001 | if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) |
… | |
… | |
2271 | if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) |
2073 | if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) |
2272 | { |
2074 | { |
2273 | op->play_sound (sound_find ("ob_evaporate")); |
2075 | op->play_sound (sound_find ("ob_evaporate")); |
2274 | new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); |
2076 | new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); |
2275 | |
2077 | |
2276 | if (op->contr) |
|
|
2277 | esrv_del_item (op->contr, tmp->count); |
|
|
2278 | |
|
|
2279 | tmp->destroy (); |
2078 | tmp->destroy (); |
2280 | CLEAR_FLAG (op, FLAG_LIFESAVE); |
2079 | CLEAR_FLAG (op, FLAG_LIFESAVE); |
2281 | |
2080 | |
2282 | if (op->stats.hp < 0) |
2081 | if (op->stats.hp < 0) |
2283 | op->stats.hp = op->stats.maxhp; |
2082 | op->stats.hp = op->stats.maxhp; |
… | |
… | |
2295 | return 0; |
2094 | return 0; |
2296 | } |
2095 | } |
2297 | |
2096 | |
2298 | /* This goes throws the inventory and removes unpaid objects, and puts them |
2097 | /* This goes throws the inventory and removes unpaid objects, and puts them |
2299 | * back in the map (location and map determined by values of env). This |
2098 | * back in the map (location and map determined by values of env). This |
2300 | * function will descend into containers. op is the object to start the search |
2099 | * function will descend into containers. op is the object to start the search |
2301 | * from. |
2100 | * from. |
2302 | */ |
2101 | */ |
2303 | static void |
2102 | static void |
2304 | drop_unpaid_items (object *op, object *env) |
2103 | drop_unpaid_items (object *op, object *env) |
2305 | { |
2104 | { |
2306 | while (op) |
2105 | while (op) |
2307 | { |
2106 | { |
2308 | object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ |
2107 | object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ |
2309 | |
2108 | |
2310 | if (QUERY_FLAG (op, FLAG_UNPAID)) |
2109 | if (QUERY_FLAG (op, FLAG_UNPAID)) |
2311 | { |
|
|
2312 | if (env->type == PLAYER) |
|
|
2313 | esrv_del_item (env->contr, op->count); |
|
|
2314 | |
|
|
2315 | op->insert_at (env); |
2110 | op->insert_at (env); |
2316 | } |
|
|
2317 | else if (op->inv) |
2111 | else if (op->inv) |
2318 | drop_unpaid_items (op->inv, env); |
2112 | drop_unpaid_items (op->inv, env); |
2319 | |
2113 | |
2320 | op = next; |
2114 | op = next; |
2321 | } |
2115 | } |
… | |
… | |
2333 | * Moved from apply.c to player.c - player.c is what |
2127 | * Moved from apply.c to player.c - player.c is what |
2334 | * actually uses this function. player.c may not be quite the |
2128 | * actually uses this function. player.c may not be quite the |
2335 | * best, a misc file for object actions is probably better, |
2129 | * best, a misc file for object actions is probably better, |
2336 | * but there isn't one in the server directory. |
2130 | * but there isn't one in the server directory. |
2337 | */ |
2131 | */ |
2338 | char * |
2132 | const char * |
2339 | gravestone_text (object *op) |
2133 | gravestone_text (object *op) |
2340 | { |
2134 | { |
2341 | static char buf2[MAX_BUF]; |
2135 | static dynbuf_text buf; |
2342 | char buf[MAX_BUF]; |
|
|
2343 | time_t now = time (NULL); |
|
|
2344 | |
2136 | |
2345 | strcpy (buf2, " R.I.P.\n\n"); |
2137 | buf << "---- R.I.P. ----\n\n" |
|
|
2138 | << op->name; |
|
|
2139 | |
2346 | if (op->type == PLAYER) |
2140 | if (op->type == PLAYER) |
2347 | sprintf (buf, "%s the %s\n", &op->name, op->contr->title); |
2141 | buf << " the " << op->contr->title; |
2348 | else |
|
|
2349 | sprintf (buf, "%s\n", &op->name); |
|
|
2350 | |
2142 | |
2351 | strncat (buf2, " ", 20 - strlen (buf) / 2); |
2143 | buf << "\n\n"; |
2352 | strcat (buf2, buf); |
2144 | |
|
|
2145 | buf << "who was level "; |
|
|
2146 | buf << (sint32)op->level << "\n\n" // OO breakdown |
|
|
2147 | << " when " << (op->contr ? "killed" : "died") << "\n\n"; |
|
|
2148 | |
2353 | if (op->type == PLAYER) |
2149 | if (op->type == PLAYER) |
2354 | sprintf (buf, "who was in level %d when killed\n", op->level); |
2150 | buf << "by " << op->contr->killer_name () << ".\n\n"; |
2355 | else |
|
|
2356 | sprintf (buf, "who was in level %d when died.\n\n", op->level); |
|
|
2357 | |
2151 | |
2358 | strncat (buf2, " ", 20 - strlen (buf) / 2); |
|
|
2359 | strcat (buf2, buf); |
|
|
2360 | if (op->type == PLAYER) |
|
|
2361 | { |
2152 | { |
2362 | sprintf (buf, "by %s.\n\n", op->contr->killer); |
2153 | static char buf2[128]; |
2363 | strncat (buf2, " ", 21 - strlen (buf) / 2); |
2154 | time_t now = time (NULL); |
2364 | strcat (buf2, buf); |
|
|
2365 | } |
|
|
2366 | |
|
|
2367 | strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now)); |
2155 | strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now)); |
2368 | strncat (buf2, " ", 20 - strlen (buf) / 2); |
2156 | buf << buf2; |
2369 | strcat (buf2, buf); |
2157 | } |
2370 | |
2158 | |
2371 | return buf2; |
2159 | return buf; |
2372 | } |
2160 | } |
2373 | |
2161 | |
2374 | void |
2162 | void |
2375 | do_some_living (object *op) |
2163 | do_some_living (object *op) |
2376 | { |
2164 | { |
… | |
… | |
2531 | { |
2319 | { |
2532 | over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp; |
2320 | over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp; |
2533 | |
2321 | |
2534 | if (over_hp > 0) |
2322 | if (over_hp > 0) |
2535 | { |
2323 | { |
2536 | op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; |
2324 | op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; |
2537 | op->last_heal = 0; |
2325 | op->last_heal = 0; |
2538 | } |
2326 | } |
2539 | else |
2327 | else |
2540 | op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); |
2328 | op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); |
2541 | } |
2329 | } |
… | |
… | |
2557 | op->stats.food--; |
2345 | op->stats.food--; |
2558 | } |
2346 | } |
2559 | |
2347 | |
2560 | if (op->stats.food < 0 && op->stats.hp >= 0) |
2348 | if (op->stats.food < 0 && op->stats.hp >= 0) |
2561 | { |
2349 | { |
2562 | object *tmp, *flesh = 0; |
2350 | object *flesh = 0; |
2563 | |
2351 | |
2564 | for (tmp = op->inv; tmp; tmp = tmp->below) |
2352 | for_inv_removable (op, tmp) |
2565 | { |
2353 | { |
2566 | if (!QUERY_FLAG (tmp, FLAG_UNPAID)) |
2354 | if (QUERY_FLAG (tmp, FLAG_UNPAID)) |
|
|
2355 | continue; |
|
|
2356 | |
|
|
2357 | if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) |
2567 | { |
2358 | { |
2568 | if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) |
2359 | op->statusmsg ("You blindly grab for a bite of food. " |
2569 | { |
2360 | "H<To prevent you from starving, you ate some random item from your backpack.>"); |
2570 | new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); |
|
|
2571 | manual_apply (op, tmp, 0); |
2361 | manual_apply (op, tmp, 0); |
|
|
2362 | |
2572 | if (op->stats.food >= 0 || op->stats.hp < 0) |
2363 | if (op->stats.food >= 0 || op->stats.hp < 0) |
2573 | break; |
2364 | break; |
2574 | } |
2365 | } |
2575 | else if (tmp->type == FLESH) |
2366 | else if (tmp->type == FLESH) |
2576 | flesh = tmp; |
2367 | flesh = tmp; |
2577 | } /* End if paid for object */ |
2368 | } |
2578 | } /* end of for loop */ |
|
|
2579 | |
2369 | |
2580 | /* If player is still starving, it means they don't have any food, so |
2370 | /* If player is still starving, it means they don't have any food, so |
2581 | * eat flesh instead. |
2371 | * eat flesh instead. |
2582 | */ |
2372 | */ |
2583 | if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) |
2373 | if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) |
2584 | { |
2374 | { |
2585 | new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); |
2375 | op->statusmsg ("You blindly grab for a bite of food. " |
|
|
2376 | "H<To prevent you from starving, you ate some random item from your backpack.>"); |
2586 | manual_apply (op, flesh, 0); |
2377 | manual_apply (op, flesh, 0); |
2587 | } |
2378 | } |
|
|
2379 | |
|
|
2380 | // If player is still starving, alert him! |
|
|
2381 | if (op->stats.food < 0) |
|
|
2382 | op->failmsg ("You are starving! " |
|
|
2383 | "H<Eat some food to increase your food and prevent you from an untimely death.>"); |
2588 | } |
2384 | } |
2589 | |
2385 | |
2590 | if (op->stats.food < 0) |
2386 | if (op->stats.food < 0) |
2591 | { |
2387 | { |
2592 | op->stats.hp += op->stats.food; |
2388 | op->stats.hp += op->stats.food; |
2593 | op->stats.food = 0; |
2389 | op->stats.food = 0; |
|
|
2390 | |
|
|
2391 | if (op->stats.hp < 0) |
|
|
2392 | { |
|
|
2393 | op->contr->killer = archetype::get ("killer_starvation"); |
|
|
2394 | op->contr->killer->destroy (); |
2594 | } |
2395 | } |
|
|
2396 | } |
2595 | |
2397 | |
|
|
2398 | /* killer should be set here already */ |
2596 | if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) |
2399 | if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) |
2597 | kill_player (op); |
2400 | kill_player (op); |
2598 | } |
2401 | } |
2599 | } |
2402 | } |
2600 | |
2403 | |
… | |
… | |
2605 | */ |
2408 | */ |
2606 | void |
2409 | void |
2607 | kill_player (object *op) |
2410 | kill_player (object *op) |
2608 | { |
2411 | { |
2609 | int x, y; |
2412 | int x, y; |
2610 | char buf[MAX_BUF]; |
|
|
2611 | maptile *map; /* this is for resurrection */ |
2413 | maptile *map; /* this is for resurrection */ |
2612 | int will_kill_again; |
2414 | int will_kill_again; |
2613 | archetype *at; |
2415 | archetype *at; |
2614 | object *tmp; |
2416 | object *tmp; |
2615 | |
2417 | |
2616 | if (save_life (op)) |
2418 | if (save_life (op)) |
2617 | return; |
2419 | return; |
|
|
2420 | |
|
|
2421 | dynbuf_text deathtab; |
|
|
2422 | |
|
|
2423 | /* restore player */ |
|
|
2424 | at = archetype::find ("poisoning"); |
|
|
2425 | if (object *tmp = present_arch_in_ob (at, op)) |
|
|
2426 | { |
|
|
2427 | tmp->destroy (); |
|
|
2428 | deathtab << "Your body feels cleansed...\r"; |
|
|
2429 | } |
|
|
2430 | |
|
|
2431 | at = archetype::find ("confusion"); |
|
|
2432 | if (object *tmp = present_arch_in_ob (at, op)) |
|
|
2433 | { |
|
|
2434 | tmp->destroy (); |
|
|
2435 | deathtab << "Your mind feels clearer...\r"; |
|
|
2436 | } |
|
|
2437 | |
|
|
2438 | cure_disease (op, 0, 0); /* remove any disease */ |
|
|
2439 | |
|
|
2440 | max_it (op->stats.hp , op->stats.maxhp); |
|
|
2441 | max_it (op->stats.sp , op->stats.maxsp); |
|
|
2442 | max_it (op->stats.grace, op->stats.maxgrace); |
|
|
2443 | |
|
|
2444 | if (op->stats.food <= 0) |
|
|
2445 | op->stats.food = 999; |
|
|
2446 | |
|
|
2447 | // remove all spell effects that are active |
|
|
2448 | // to avoid long-term effects such as word-of-recall |
|
|
2449 | for (object *item = op->inv; item; ) |
|
|
2450 | { |
|
|
2451 | object *next = item->below; |
|
|
2452 | |
|
|
2453 | if (item->type == SPELL_EFFECT && item->active) |
|
|
2454 | item->destroy (); |
|
|
2455 | |
|
|
2456 | item = next; |
|
|
2457 | } |
2618 | |
2458 | |
2619 | /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas |
2459 | /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas |
2620 | * in cities ONLY!!! It is very important that this doesn't get abused. |
2460 | * in cities ONLY!!! It is very important that this doesn't get abused. |
2621 | * Look at op_on_battleground() for more info --AndreasV |
2461 | * Look at op_on_battleground() for more info --AndreasV |
2622 | */ |
2462 | */ |
2623 | if (op_on_battleground (op, &x, &y)) |
2463 | if (op_on_battleground (op, &x, &y)) |
2624 | { |
2464 | { |
2625 | new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); |
2465 | deathtab << "You almost died in combat, but local medics have saved your life...\r"; |
2626 | new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life..."); |
|
|
2627 | |
|
|
2628 | /* restore player */ |
|
|
2629 | at = archetype::find ("poisoning"); |
|
|
2630 | if (object *tmp = present_arch_in_ob (at, op)) |
|
|
2631 | { |
|
|
2632 | tmp->destroy (); |
|
|
2633 | new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); |
|
|
2634 | } |
|
|
2635 | |
|
|
2636 | at = archetype::find ("confusion"); |
|
|
2637 | if (object *tmp = present_arch_in_ob (at, op)) |
|
|
2638 | { |
|
|
2639 | tmp->destroy (); |
|
|
2640 | new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); |
|
|
2641 | } |
|
|
2642 | |
|
|
2643 | cure_disease (op, 0, 0); /* remove any disease */ |
|
|
2644 | op->stats.hp = op->stats.maxhp; |
|
|
2645 | if (op->stats.food <= 0) |
|
|
2646 | op->stats.food = 999; |
|
|
2647 | |
2466 | |
2648 | /* create a bodypart-trophy to make the winner happy */ |
2467 | /* create a bodypart-trophy to make the winner happy */ |
2649 | if (object *tmp = arch_to_object (archetype::find ("finger"))) |
2468 | if (object *tmp = arch_to_object (archetype::find ("finger"))) |
2650 | { |
2469 | { |
2651 | tmp->name = format ("%s's finger" , &op->name); |
2470 | tmp->name = format ("%s's finger" , &op->name); |
2652 | tmp->name_pl = format ("%s's fingers", &op->name); |
2471 | tmp->name_pl = format ("%s's fingers", &op->name); |
2653 | tmp->msg = format ( |
2472 | tmp->msg = format ( |
2654 | "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n", |
2473 | "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n", |
2655 | &op->name, op->contr->title, (int) (op->level), op->contr->killer |
2474 | &op->name, op->contr->title, |
|
|
2475 | (int)op->level, |
|
|
2476 | op->contr->killer_name () |
2656 | ); |
2477 | ); |
2657 | tmp->value = 0, tmp->type = 0; |
2478 | tmp->value = 0, tmp->type = 0; |
2658 | tmp->materialname = "organics"; |
2479 | tmp->materialname = "organics"; |
2659 | tmp->insert_at (op, tmp); |
2480 | tmp->insert_at (op, tmp); |
2660 | } |
2481 | } |
2661 | |
2482 | |
2662 | /* teleport defeated player to new destination */ |
2483 | /* teleport defeated player to new destination */ |
2663 | transfer_ob (op, x, y, 0, NULL); |
2484 | transfer_ob (op, x, y, 0, NULL); |
2664 | op->contr->braced = 0; |
2485 | op->contr->braced = 0; |
|
|
2486 | |
|
|
2487 | op->contr->infobox (MSG_CHANNEL ("death"), deathtab); |
2665 | return; |
2488 | return; |
2666 | } |
2489 | } |
2667 | |
2490 | |
|
|
2491 | deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n"; |
|
|
2492 | deathtab << "T<YOU HAVE DIED>\n\n"; |
|
|
2493 | |
2668 | INVOKE_PLAYER (DEATH, op->contr); |
2494 | INVOKE_PLAYER (DEATH, op->contr); |
2669 | |
2495 | |
2670 | command_kill_pets (op, 0); |
2496 | command_kill_pets (op, 0); |
2671 | |
|
|
2672 | if (op->stats.food < 0) |
|
|
2673 | strcpy (op->contr->killer, "starvation"); |
|
|
2674 | |
2497 | |
2675 | op->contr->play_sound (sound_find ("player_dies")); |
2498 | op->contr->play_sound (sound_find ("player_dies")); |
2676 | |
2499 | |
2677 | /* save the map location for corpse, gravestone */ |
2500 | /* save the map location for corpse, gravestone */ |
2678 | x = op->x; |
2501 | x = op->x; |
… | |
… | |
2708 | |
2531 | |
2709 | lost_a_stat = 0; |
2532 | lost_a_stat = 0; |
2710 | |
2533 | |
2711 | for (z = 0; z < num_stats_lose; z++) |
2534 | for (z = 0; z < num_stats_lose; z++) |
2712 | { |
2535 | { |
2713 | i = RANDOM () % NUM_STATS; |
2536 | i = rndm (NUM_STATS); |
2714 | |
2537 | |
2715 | if (settings.stat_loss_on_death) |
2538 | if (settings.stat_loss_on_death) |
2716 | { |
2539 | { |
2717 | /* Pick a random stat and take a point off it. Tell the player |
2540 | /* Pick a random stat and take a point off it. Tell the player |
2718 | * what he lost. |
2541 | * what he lost. |
… | |
… | |
2769 | } |
2592 | } |
2770 | } |
2593 | } |
2771 | |
2594 | |
2772 | if (lose_this_stat) |
2595 | if (lose_this_stat) |
2773 | { |
2596 | { |
2774 | this_stat = get_attr_value (&(dep->stats), i); |
2597 | this_stat = get_attr_value (&dep->stats, i); |
2775 | /* We could try to do something clever like find another |
2598 | /* We could try to do something clever like find another |
2776 | * stat to reduce if this fails. But chances are, if |
2599 | * stat to reduce if this fails. But chances are, if |
2777 | * stats have been depleted to -50, all are pretty low |
2600 | * stats have been depleted to -50, all are pretty low |
2778 | * and should be roughly the same, so it shouldn't make a |
2601 | * and should be roughly the same, so it shouldn't make a |
2779 | * difference. |
2602 | * difference. |
… | |
… | |
2787 | lost_a_stat = 1; |
2610 | lost_a_stat = 1; |
2788 | } |
2611 | } |
2789 | } |
2612 | } |
2790 | } |
2613 | } |
2791 | } |
2614 | } |
|
|
2615 | |
2792 | /* If no stat lost, tell the player. */ |
2616 | /* If no stat lost, tell the player. */ |
2793 | if (!lost_a_stat) |
2617 | if (!lost_a_stat) |
2794 | { |
2618 | { |
2795 | /* determine_god() seems to not work sometimes... why is this? |
2619 | /* determine_god() seems to not work sometimes... why is this? |
2796 | Should I be using something else? GD */ |
2620 | Should I be using something else? GD */ |
2797 | const char *god = determine_god (op); |
2621 | shstr_tmp god = determine_god (op); |
2798 | |
2622 | |
2799 | if (god && (strcmp (god, "none"))) |
2623 | if (god != shstr_none) |
2800 | new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god); |
2624 | deathtab << "For a brief moment you feel the holy presence of " << god << " protecting you.\r"; |
2801 | else |
2625 | else |
2802 | new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you."); |
2626 | deathtab << "For a brief moment you feel a holy presence protecting you.\r"; |
2803 | } |
2627 | } |
2804 | #else |
2628 | #else |
2805 | new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely."); |
2629 | deathtab << "For a brief moment you feel a holy presence protecting you from losing yourself completely."; |
2806 | #endif |
2630 | #endif |
2807 | |
2631 | |
2808 | /* Put a gravestone up where the character 'almost' died. List the |
2632 | /* Put a gravestone up where the character 'almost' died. List the |
2809 | * exp loss on the stone. |
2633 | * exp loss on the stone. |
2810 | */ |
2634 | */ |
2811 | tmp = arch_to_object (archetype::find ("gravestone")); |
2635 | tmp = arch_to_object (archetype::find ("gravestone")); |
2812 | sprintf (buf, "%s's gravestone", &op->name); |
2636 | tmp->name = format ("%s's gravestone", &op->name); |
2813 | tmp->name = buf; |
2637 | tmp->name_pl = format ("%s's gravestones", &op->name); |
2814 | sprintf (buf, "%s's gravestones", &op->name); |
2638 | tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n", |
2815 | tmp->name_pl = buf; |
2639 | &op->name, op->contr->title, op->contr->killer_name ()); |
2816 | sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer); |
|
|
2817 | tmp->msg = buf; |
|
|
2818 | tmp->x = op->x, tmp->y = op->y; |
2640 | tmp->x = op->x, tmp->y = op->y; |
2819 | insert_ob_in_map (tmp, op->map, NULL, 0); |
2641 | insert_ob_in_map (tmp, op->map, NULL, 0); |
2820 | |
2642 | |
2821 | /**************************************/ |
2643 | /**************************************/ |
2822 | /* */ |
2644 | /* */ |
2823 | /* Subtract the experience points, */ |
2645 | /* Subtract the experience points, */ |
2824 | /* if we died cause of food, give us */ |
|
|
2825 | /* food, and reset HP's... */ |
|
|
2826 | /* */ |
2646 | /* */ |
2827 | /**************************************/ |
2647 | /**************************************/ |
2828 | |
2648 | |
2829 | /* remove any poisoning and confusion the character may be suffering. */ |
|
|
2830 | /* restore player */ |
|
|
2831 | at = archetype::find ("poisoning"); |
|
|
2832 | tmp = present_arch_in_ob (at, op); |
|
|
2833 | |
|
|
2834 | if (tmp) |
|
|
2835 | { |
|
|
2836 | tmp->destroy (); |
|
|
2837 | new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); |
|
|
2838 | } |
|
|
2839 | |
|
|
2840 | at = archetype::find ("confusion"); |
|
|
2841 | tmp = present_arch_in_ob (at, op); |
|
|
2842 | if (tmp) |
|
|
2843 | { |
|
|
2844 | tmp->destroy (); |
|
|
2845 | new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); |
|
|
2846 | } |
|
|
2847 | |
|
|
2848 | cure_disease (op, 0, 0); /* remove any disease */ |
|
|
2849 | |
|
|
2850 | /*add_exp(op, (op->stats.exp * -0.20)); */ |
2649 | /*add_exp(op, (op->stats.exp * -0.20)); */ |
2851 | apply_death_exp_penalty (op); |
2650 | apply_death_exp_penalty (op); |
2852 | if (op->stats.food < 100) |
|
|
2853 | op->stats.food = 900; |
|
|
2854 | op->stats.hp = op->stats.maxhp; |
|
|
2855 | op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); |
|
|
2856 | op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); |
|
|
2857 | |
2651 | |
2858 | /* |
2652 | /* |
2859 | * Check to see if the player has any unpaid items. If so, remove them |
2653 | * Check to see if the player has any unpaid items. If so, remove them |
2860 | * and put them back in the map. |
2654 | * and put them back in the map. |
2861 | */ |
2655 | */ |
… | |
… | |
2896 | if (will_kill_again & (1 << at)) |
2690 | if (will_kill_again & (1 << at)) |
2897 | force->resist[at] = 100; |
2691 | force->resist[at] = 100; |
2898 | |
2692 | |
2899 | insert_ob_in_ob (force, op); |
2693 | insert_ob_in_ob (force, op); |
2900 | op->update_stats (); |
2694 | op->update_stats (); |
2901 | |
|
|
2902 | } |
2695 | } |
2903 | |
2696 | |
2904 | new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED."); |
2697 | op->contr->infobox (MSG_CHANNEL ("death"), deathtab); |
2905 | } |
2698 | } |
2906 | |
2699 | |
2907 | void |
2700 | void |
2908 | loot_object (object *op) |
2701 | loot_object (object *op) |
2909 | { /* Grab and destroy some treasure */ |
2702 | { /* Grab and destroy some treasure */ |
… | |
… | |
3007 | } |
2800 | } |
3008 | |
2801 | |
3009 | void |
2802 | void |
3010 | make_visible (object *op) |
2803 | make_visible (object *op) |
3011 | { |
2804 | { |
3012 | op->hide = 0; |
2805 | op->flag [FLAG_HIDDEN] = 0; |
3013 | op->invisible = 0; |
2806 | op->invisible = 0; |
3014 | |
2807 | |
3015 | if (op->type == PLAYER) |
2808 | if (op->type == PLAYER) |
3016 | { |
2809 | { |
3017 | op->contr->tmp_invis = 0; |
2810 | op->contr->tmp_invis = 0; |
… | |
… | |
3042 | |
2835 | |
3043 | if (!ob || !ob->map) |
2836 | if (!ob || !ob->map) |
3044 | return 0; |
2837 | return 0; |
3045 | |
2838 | |
3046 | /* so, on normal lighted maps, its hard to hide */ |
2839 | /* so, on normal lighted maps, its hard to hide */ |
3047 | level = ob->map->darkness - 2; |
2840 | level = ob->map->darklevel () - 2; |
3048 | |
2841 | |
3049 | /* this also picks up whether the object is glowing. |
2842 | /* this also picks up whether the object is glowing. |
3050 | * If you carry a light on a non-dark map, its not |
2843 | * If you carry a light on a non-dark map, its not |
3051 | * as bad as carrying a light on a pitch dark map */ |
2844 | * as bad as carrying a light on a pitch dark map */ |
3052 | if (has_carried_lights (ob)) |
2845 | if (ob->has_carried_lights ()) |
3053 | level = -(10 + (2 * ob->map->darkness)); |
2846 | level = -(10 + (2 * ob->map->darklevel ())); |
3054 | |
2847 | |
3055 | /* scan through all nearby squares for terrain to hide in */ |
2848 | /* scan through all nearby squares for terrain to hide in */ |
3056 | for (i = 0, x = ob->x, y = ob->y; |
2849 | for (i = 0, x = ob->x, y = ob->y; |
3057 | i <= SIZEOFFREE1; |
2850 | i <= SIZEOFFREE1; |
3058 | i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i]) |
2851 | i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i]) |
… | |
… | |
3079 | * spot (surrounded by clear terrain in broad daylight). -b.t. |
2872 | * spot (surrounded by clear terrain in broad daylight). -b.t. |
3080 | */ |
2873 | */ |
3081 | void |
2874 | void |
3082 | do_hidden_move (object *op) |
2875 | do_hidden_move (object *op) |
3083 | { |
2876 | { |
3084 | int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); |
2877 | int hide = 0; |
3085 | object *skop; |
|
|
3086 | |
2878 | |
3087 | if (!op || !op->map) |
2879 | if (!op || !op->map) |
3088 | return; |
2880 | return; |
3089 | |
2881 | |
3090 | skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); |
2882 | object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); |
|
|
2883 | int num = random_roll (0, 19, op, PREFER_LOW); |
3091 | |
2884 | |
3092 | /* its *extremely* hard to run and sneak/hide at the same time! */ |
2885 | /* its *extremely* hard to run and sneak/hide at the same time! */ |
3093 | if (op->type == PLAYER && op->contr->run_on) |
2886 | if (op->type == PLAYER && op->contr->run_on) |
3094 | if (!skop || num >= skop->level) |
2887 | if (!skop || num >= skop->level) |
3095 | { |
2888 | { |
… | |
… | |
3105 | num -= hide; |
2898 | num -= hide; |
3106 | |
2899 | |
3107 | if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) |
2900 | if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) |
3108 | { |
2901 | { |
3109 | make_visible (op); |
2902 | make_visible (op); |
|
|
2903 | |
3110 | if (op->type == PLAYER) |
2904 | if (op->type == PLAYER) |
3111 | new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); |
2905 | new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); |
3112 | } |
2906 | } |
3113 | else if (op->type == PLAYER && skop) |
2907 | else if (op->type == PLAYER && skop) |
3114 | change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); |
2908 | change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); |
… | |
… | |
3204 | while (op) |
2998 | while (op) |
3205 | { |
2999 | { |
3206 | dx = rv.distance_x + op->arch->x; |
3000 | dx = rv.distance_x + op->arch->x; |
3207 | dy = rv.distance_y + op->arch->y; |
3001 | dy = rv.distance_y + op->arch->y; |
3208 | |
3002 | |
3209 | /* only the viewable area the player sees is updated by LOS |
3003 | if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED) |
3210 | * code, so we need to restrict ourselves to that range of values |
|
|
3211 | * for any meaningful values. |
|
|
3212 | */ |
|
|
3213 | if (abs (dx) <= (pl->contr->ns->mapx / 2) && |
|
|
3214 | abs (dy) <= (pl->contr->ns->mapy / 2) && |
|
|
3215 | !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)]) |
|
|
3216 | return 1; |
3004 | return 1; |
3217 | |
3005 | |
3218 | op = op->more; |
3006 | op = op->more; |
3219 | } |
3007 | } |
3220 | |
3008 | |
3221 | return 0; |
3009 | return 0; |
3222 | } |
3010 | } |
3223 | |
3011 | |
3224 | /* routine for both players and monsters. We call this when |
3012 | /* routine for both players and monsters. We call this when |
3225 | * there is a possibility for our action distrubing our hiding |
3013 | * there is a possibility for our action distrubing our hiding |
3226 | * place or invisiblity spell. Artefact invisiblity is not |
3014 | * place or invisiblity spell. Artefact invisiblity causes |
3227 | * effected by this. If we arent invisible to begin with, we |
3015 | * "noise" instead. If we arent invisible to begin with, we |
3228 | * return 0. |
3016 | * return 0. |
3229 | */ |
3017 | */ |
3230 | int |
3018 | int |
3231 | action_makes_visible (object *op) |
3019 | action_makes_visible (object *op) |
3232 | { |
3020 | { |
3233 | if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) |
3021 | if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) |
3234 | { |
3022 | { |
3235 | if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) |
3023 | if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) |
|
|
3024 | { |
|
|
3025 | // artefact invisibility is permanent, but we still make noise |
|
|
3026 | // this is important for game-balance. |
|
|
3027 | if (op->contr) |
|
|
3028 | op->make_noise (); |
|
|
3029 | |
3236 | return 0; |
3030 | return 0; |
|
|
3031 | } |
3237 | |
3032 | |
3238 | if (op->contr && op->contr->tmp_invis == 0) |
3033 | if (op->contr && op->contr->tmp_invis == 0) |
3239 | return 0; |
3034 | return 0; |
3240 | |
3035 | |
3241 | /* If monsters, they should become visible */ |
3036 | /* If monsters, they should become visible */ |
3242 | if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis)) |
3037 | if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis)) |
3243 | { |
3038 | { |
3244 | new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible"); |
3039 | new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible"); |
3245 | return 1; |
3040 | return 1; |
3246 | } |
3041 | } |
3247 | } |
3042 | } |
3248 | |
3043 | |
3249 | return 0; |
3044 | return 0; |
… | |
… | |
3455 | else |
3250 | else |
3456 | { |
3251 | { |
3457 | /* generate misc. treasure */ |
3252 | /* generate misc. treasure */ |
3458 | tmp = arch_to_object (tr->item); |
3253 | tmp = arch_to_object (tr->item); |
3459 | new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp)); |
3254 | new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp)); |
3460 | tmp = insert_ob_in_ob (tmp, who); |
3255 | who->insert (tmp); |
3461 | if (who->type == PLAYER) |
|
|
3462 | esrv_send_item (who, tmp); |
|
|
3463 | } |
3256 | } |
3464 | } |
3257 | } |
3465 | |
3258 | |
3466 | /** |
3259 | /** |
3467 | * Unready an object for a player. This function does nothing if the object was |
3260 | * Unready an object for a player. This function does nothing if the object was |
… | |
… | |
3479 | if (pl->ranged_ob == ob) |
3272 | if (pl->ranged_ob == ob) |
3480 | pl->ranged_ob = 0; |
3273 | pl->ranged_ob = 0; |
3481 | } |
3274 | } |
3482 | |
3275 | |
3483 | sint8 |
3276 | sint8 |
3484 | player::visibility_at (maptile *map, int x, int y) const |
3277 | player::darkness_at (maptile *map, int x, int y) const |
3485 | { |
3278 | { |
3486 | if (!ns) |
3279 | if (!ns) |
3487 | return 0; |
3280 | return LOS_BLOCKED; |
3488 | |
3281 | |
3489 | int dx, dy; |
3282 | int dx, dy; |
3490 | if (!adjacent_map (map, ns->current_map, &dx, &dy)) |
3283 | if (!adjacent_map (map, ns->current_map, &dx, &dy)) |
3491 | return 0; |
3284 | return LOS_BLOCKED; |
3492 | |
3285 | |
3493 | x += dx - ns->current_x + ns->mapx / 2; |
3286 | x += dx - ns->current_x; |
3494 | y += dy - ns->current_y + ns->mapy / 2; |
3287 | y += dy - ns->current_y; |
3495 | |
3288 | |
3496 | if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy)) |
|
|
3497 | return 0; |
|
|
3498 | |
|
|
3499 | return 100 - blocked_los [x][y]; |
3289 | return blocked_los (x, y); |
3500 | } |
3290 | } |
3501 | |
3291 | |
3502 | void |
3292 | void |
3503 | player::infobox (const char *title, const char *msg, int color) |
3293 | player::infobox (const char *title, const char *msg, int color) |
3504 | { |
3294 | { |