ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/player.C
(Generate patch)

Comparing deliantra/server/server/player.C (file contents):
Revision 1.192 by root, Wed Apr 30 06:40:28 2008 UTC vs.
Revision 1.250 by root, Sat Dec 12 03:17:21 2009 UTC

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,2008 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 */
24
25//+GPL
23 26
24#include <global.h> 27#include <global.h>
25#include <sproto.h> 28#include <sproto.h>
26#include <sounds.h> 29#include <sounds.h>
27#include <living.h> 30#include <living.h>
… …
32#include <algorithm> 35#include <algorithm>
33#include <functional> 36#include <functional>
34 37
35playervec players; 38playervec players;
36 39
37void
38display_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
66void
67send_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
101void
102send_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. */ 40/* This loads the first map an puts the player on it. */
152static void 41static void
153set_first_map (object *op) 42set_first_map (object *op)
154{ 43{
155 op->contr->maplevel = first_map_path; 44 op->contr->maplevel = first_map_path;
… …
207 ob->close_container (); //TODO: client-specific 96 ob->close_container (); //TODO: client-specific
208 97
209 ns->update_look = 0; 98 ns->update_look = 0;
210 ns->look_position = 0; 99 ns->look_position = 0;
211 100
212 clear_los (this); 101 clear_los ();
213 102
214 ns->reset_stats (); 103 ns->reset_stats ();
215 104
216 /* make sure he's a player -- needed because of class change. */ 105 /* make sure he's a player -- needed because of class change. */
217 ob->type = PLAYER; // we are paranoid 106 ob->type = PLAYER; // we are paranoid
218 ob->race = ob->arch->race; 107 ob->race = ob->arch->race;
219 108
220 ob->update_weight (); 109 ob->update_weight ();
221 link_player_skills (ob); 110 link_skills ();
222
223 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
227 /* if it's a dragon player, set the correct title here */ 114 /* if it's a dragon player, set the correct title here */
228 if (is_dragon_pl (ob)) 115 if (is_dragon_pl (ob))
… …
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 ();
253
254 send_rules (ob);
255 send_news (ob);
256 display_motd (ob);
257
258 INVOKE_PLAYER (CONNECT, this);
259 INVOKE_PLAYER (LOGIN, this);
260}
261
262void
263player::disconnect ()
264{
265 if (ob)
266 {
267 ob->close_container (); //TODO: client-specific
268 ob->drop_unpaid_items ();
269 }
270
271 if (ns)
272 {
273 if (active)
274 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
275
276 INVOKE_PLAYER (DISCONNECT, this);
277
278 ns->reset_stats ();
279 ns->pl = 0;
280 ns = 0;
281 }
282
283 observe = ob;
284
285 deactivate ();
286}
287
288// the need for this function can be explained
289// by load_object not returning the object
290void
291player::set_object (object *op)
292{
293 ob = observe = op;
294 ob->contr = this; /* this aren't yet in archetype */
295
296 ob->speed = 1.0f;
297 ob->speed_left = 0.5f;
298
299 ob->direction = 5; /* So player faces south */
300
301 ob->flag [FLAG_READY_WEAPON] = false; 139 ob->flag [FLAG_READY_WEAPON] = false;
302 ob->flag [FLAG_READY_SKILL] = false; 140 ob->flag [FLAG_READY_SKILL] = false;
303 ob->flag [FLAG_READY_BOW] = false; 141 ob->flag [FLAG_READY_BOW] = false;
304 142
305 for (object *op = ob->inv; op; op = op->below) 143 for (object *op = ob->inv; op; op = op->below)
306 if (op->flag [FLAG_APPLIED]) 144 if (op->flag [FLAG_APPLIED])
307 switch (op->type) 145 switch (op->type)
308 { 146 {
309 case SKILL: 147 case SKILL:
310 ob->flag [FLAG_APPLIED] = false; 148 op->flag [FLAG_APPLIED] = false;
311 break; 149 break;
312 150
313 case WAND: 151 case WAND:
314 case ROD: 152 case ROD:
315 case HORN: 153 case HORN:
… …
320 case WEAPON: 158 case WEAPON:
321 combat_ob = op; 159 combat_ob = op;
322 break; 160 break;
323 } 161 }
324 162
163 ob->current_weapon = 0;
325 ob->change_weapon (combat_ob ? combat_ob : ranged_ob); 164 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
326 ob->deactivate (); // change_Weapon activates, fix this better 165 activate (); // change_weapon also activates, but this doesn't hurt
166
167 INVOKE_PLAYER (CONNECT, this);
168 INVOKE_PLAYER (LOGIN, this);
169}
170
171void
172player::disconnect ()
173{
174 if (ob)
175 {
176 ob->close_container (); //TODO: client-specific
177 ob->drop_unpaid_items ();
178 }
179
180 if (ns)
181 {
182 if (active)
183 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
184
185 INVOKE_PLAYER (DISCONNECT, this);
186
187 ns->reset_stats ();
188 ns->pl = 0;
189 ns = 0;
190 }
191
192 // this is important for the player scheduler to get the correct refcount
193 // when ns = 0
194 observe = viewpoint = ob;
195
196 deactivate ();
197}
198
199//-GPL
200
201// the need for this function can be explained
202// by load_object not returning the object
203void
204player::set_object (object *op)
205{
206 ob = observe = viewpoint = op;
207 ob->contr = this; /* this aren't yet in archetype */
208
209 ob->speed = 1.0f;
210 ob->speed_left = 0.5f;
211
212 ob->direction = 5; /* So player faces south */
327} 213}
328 214
329void 215void
330player::set_observe (object *op) 216player::set_observe (object *op)
331{ 217{
332 observe = op ? op : ob; 218 observe = viewpoint = op ? op : ob;
333 do_los = 1; 219 do_los = 1;
334} 220}
221
222void
223player::set_viewpoint (object *op)
224{
225 viewpoint = op ? op : (object *)observe;
226 do_los = 1;
227}
228
229//+GPL
335 230
336player::player () 231player::player ()
337{ 232{
338 /* There are some elements we want initialised to non zero value - 233 /* There are some elements we want initialised to non zero value -
339 * we deal with that below this point. 234 * we deal with that below this point.
… …
345 savebed_map = first_map_path; /* Init. respawn position */ 240 savebed_map = first_map_path; /* Init. respawn position */
346 241
347 gen_sp_armour = 10; 242 gen_sp_armour = 10;
348 bowtype = bow_normal; 243 bowtype = bow_normal;
349 petmode = pet_normal; 244 petmode = pet_normal;
350 listening = 10;
351 usekeys = containers; 245 usekeys = containers;
352 peaceful = 1; /* default peaceful */ 246 peaceful = 1; /* default peaceful */
353 do_los = 1; 247 do_los = 1;
354 248
355 weapon_sp = 1.0f; 249 weapon_sp = 1.0f;
… …
367 { 261 {
368 ob->destroy_inv (false); 262 ob->destroy_inv (false);
369 ob->destroy (); 263 ob->destroy ();
370 } 264 }
371 265
372 ob = observe = 0; 266 ob = observe = viewpoint = 0;
373} 267}
374 268
375player::~player () 269player::~player ()
376{ 270{
377 /* Clear item stack */ 271 /* Clear item stack */
378 free (stack_items); 272 free (stack_items);
273}
274
275/*
276 * get_player_archetype() return next player archetype from archetype
277 * list. Not very efficient routine, but used only creating new players.
278 * Note: there MUST be at least one player archetype!
279 */
280static archetype *
281get_player_archetype (archetype *at)
282{
283 // archetypes could have been reloaded
284 archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
285
286 if (!nat)
287 return at;
288
289 archvec::iterator i = archetypes.find (nat);
290
291 for (;;)
292 {
293 if (++i == archetypes.end ())
294 i = archetypes.begin ();
295 else if (*i == at)
296 cleanup ("not a single player archetype found");
297
298 if ((*i)->type == PLAYER)
299 return *i;
300 }
379} 301}
380 302
381/* Tries to add player on the connection passed in ns. 303/* Tries to add player on the connection passed in ns.
382 * All we can really get in this is some settings like host and display 304 * All we can really get in this is some settings like host and display
383 * mode. 305 * mode.
… …
385player * 307player *
386player::create () 308player::create ()
387{ 309{
388 player *pl = new player; 310 player *pl = new player;
389 311
390 pl->set_object (arch_to_object (get_player_archetype (0))); 312 pl->set_object (get_player_archetype (0)->instance ());
391 313
392 pl->ob->roll_stats (); 314 pl->ob->roll_stats ();
393 pl->ob->stats.wc = 2; 315 pl->ob->stats.wc = 2;
394 pl->ob->run_away = 25; /* Then we panick... */ 316 pl->ob->run_away = 25; /* Then we panick... */
395 317
396 set_first_map (pl->ob); 318 set_first_map (pl->ob);
397 319
398 return pl; 320 return pl;
399}
400
401/*
402 * get_player_archetype() return next player archetype from archetype
403 * list. Not very efficient routine, but used only creating new players.
404 * Note: there MUST be at least one player archetype!
405 */
406archetype *
407get_player_archetype (archetype *at)
408{
409 // archetypes could have been reloaded
410 archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
411
412 if (!nat)
413 return at;
414
415 archvec::iterator i = archetypes.find (nat);
416
417 for (;;)
418 {
419 if (++i == archetypes.end ())
420 i = archetypes.begin ();
421 else if (*i == at)
422 cleanup ("not a single player archetype found");
423
424 if ((*i)->type == PLAYER)
425 return *i;
426 }
427} 321}
428 322
429object * 323object *
430get_nearest_player (object *mon) 324get_nearest_player (object *mon)
431{ 325{
… …
671 op->destroy (); 565 op->destroy ();
672 continue; 566 continue;
673 } 567 }
674 } 568 }
675 569
676 /* This really needs to be better - we should really give 570 /* Here we remove duplicated skills (as duplicated spell objects have
677 * a substitute spellbook. The problem is that we don't really 571 * _very_ confusing effects for players), which could for instance be
678 * have a good idea what to replace it with (need something like 572 * generated by bad treasurelists. - elmex
679 * a first level treasurelist for each skill.)
680 * remove duplicate skills also
681 */ 573 */
682 if (op->type == SPELLBOOK || op->type == SKILL) 574 if (op->type == SKILL)
683 { 575 {
684 object *tmp;
685
686 for (tmp = op->below; tmp; tmp = tmp->below) 576 for (object *tmp = op->below; tmp; tmp = tmp->below)
687 if (tmp->type == op->type && tmp->name == op->name) 577 if (tmp->type == op->type && tmp->name == op->name)
688 break;
689
690 if (tmp)
691 { 578 {
692 op->destroy (); 579 op->destroy ();
580 LOG (llevError,
693 LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name); 581 "give_initial_items: Removing duplicate skill %s\n", &tmp->name);
694 continue; 582 break;
695 } 583 }
696 584
697 if (op->nrof > 1) 585 if (op->nrof > 1)
698 op->nrof = 1; 586 op->nrof = 1;
699 } 587 }
700 588
… …
726 else /* lock all 'normal items by default */ 614 else /* lock all 'normal items by default */
727 SET_FLAG (op, FLAG_INV_LOCKED); 615 SET_FLAG (op, FLAG_INV_LOCKED);
728 } /* for loop of objects in player inv */ 616 } /* for loop of objects in player inv */
729 617
730 /* Need to set up the skill pointers */ 618 /* Need to set up the skill pointers */
731 link_player_skills (pl); 619 pl->contr->link_skills ();
732} 620}
733 621
734void 622void
735get_party_password (object *op, partylist *party) 623get_party_password (object *op, partylist *party)
736{ 624{
… …
746 send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:"); 634 send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
747} 635}
748 636
749/* This rolls four 1-6 rolls and sums the best 3 of the 4. */ 637/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
750static int 638static int
751roll_stat (void) 639roll_stat ()
752{ 640{
753 int a[4], i, j, k; 641 int a[4], i, j, k;
754 642
755 for (i = 0; i < 4; i++) 643 for (i = 0; i < 4; i++)
756 a[i] = (int) rndm (6) + 1; 644 a[i] = (int) rndm (6) + 1;
… …
853player::chargen_race_done () 741player::chargen_race_done ()
854{ 742{
855 /* this must before then initial items are given */ 743 /* this must before then initial items are given */
856 esrv_new_player (ob->contr); 744 esrv_new_player (ob->contr);
857 745
858 treasurelist *tl = treasurelist::find ("starting_wealth"); 746 treasurelist *tl = treasurelist::find (shstr_starting_wealth);
859 if (tl) 747 if (tl)
860 create_treasure (tl, ob, 0, 0, 0); 748 create_treasure (tl, ob, 0, 0, 0);
861 749
862 INVOKE_PLAYER (BIRTH, ob->contr); 750 INVOKE_PLAYER (BIRTH, ob->contr);
863 INVOKE_PLAYER (LOGIN, ob->contr); 751 INVOKE_PLAYER (LOGIN, ob->contr);
864 752
865 ob->contr->ns->state = ST_PLAYING; 753 ob->contr->ns->state = ST_PLAYING;
866 754
867 if (ob->msg) 755 if (ob->msg)
868 ob->msg = 0; 756 ob->msg = 0;
869
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 757
879 start_info (ob); 758 start_info (ob);
880 CLEAR_FLAG (ob, FLAG_WIZ); 759 CLEAR_FLAG (ob, FLAG_WIZ);
881 give_initial_items (ob, ob->randomitems); 760 give_initial_items (ob, ob->randomitems);
882 link_player_skills (ob);
883 esrv_send_inventory (ob, ob); 761 esrv_send_inventory (ob, ob);
884 ob->update_stats (); 762 ob->update_stats ();
885 763
886 /* This moves the player to a different start map, if there 764 /* This moves the player to a different start map, if there
887 * is one for this race 765 * is one for this race
888 */ 766 */
889 if (*first_map_ext_path) 767 if (*first_map_ext_path)
890 { 768 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 769 else
905 LOG (llevDebug, "first_map_ext_path not set\n"); 770 LOG (llevDebug, "first_map_ext_path not set\n");
906} 771}
907 772
908void 773void
… …
939 ob->stats.hp = ob->stats.maxhp; 804 ob->stats.hp = ob->stats.maxhp;
940 ob->stats.sp = ob->stats.maxsp; 805 ob->stats.sp = ob->stats.maxsp;
941 ob->stats.grace = 0; 806 ob->stats.grace = 0;
942} 807}
943 808
944void 809static void
945flee_player (object *op) 810flee_player (object *op)
946{ 811{
947 int dir, diff; 812 int dir, diff;
948 rv_vector rv; 813 rv_vector rv;
949 814
… …
952 LOG (llevDebug, "Fleeing player is dead.\n"); 817 LOG (llevDebug, "Fleeing player is dead.\n");
953 CLEAR_FLAG (op, FLAG_SCARED); 818 CLEAR_FLAG (op, FLAG_SCARED);
954 return; 819 return;
955 } 820 }
956 821
957 if (op->enemy == NULL) 822 if (!op->enemy)
958 { 823 {
959 LOG (llevDebug, "Fleeing player had no enemy.\n"); 824 LOG (llevDebug, "Fleeing player had no enemy.\n");
960 CLEAR_FLAG (op, FLAG_SCARED); 825 CLEAR_FLAG (op, FLAG_SCARED);
961 return; 826 return;
962 } 827 }
963 828
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)) 829 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
976 { 830 {
977 op->enemy = NULL; 831 op->enemy = NULL;
978 CLEAR_FLAG (op, FLAG_SCARED); 832 CLEAR_FLAG (op, FLAG_SCARED);
979 return; 833 return;
… …
982 get_rangevector (op, op->enemy, &rv, 0); 836 get_rangevector (op, op->enemy, &rv, 0);
983 837
984 dir = absdir (4 + rv.direction); 838 dir = absdir (4 + rv.direction);
985 for (diff = 0; diff < 3; diff++) 839 for (diff = 0; diff < 3; diff++)
986 { 840 {
987 int m = 1 - (RANDOM () & 2); 841 int m = 1 - rndm (2) * 2;
988 842
989 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op))) 843 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
990 return; 844 return;
991 } 845 }
992 846
… …
1003check_pick (object *op) 857check_pick (object *op)
1004{ 858{
1005 object *tmp, *next; 859 object *tmp, *next;
1006 int stop = 0; 860 int stop = 0;
1007 int wvratio; 861 int wvratio;
1008 char putstring[128];
1009 862
1010 /* if you're flying, you cna't pick up anything */ 863 /* if you're flying, you cna't pick up anything */
1011 if (op->move_type & MOVE_FLYING) 864 if (op->move_type & MOVE_FLYING)
1012 return 1; 865 return 1;
1013 866
1014 next = op->below; 867 next = op->below;
1015 868
1016 int cnt = MAX_ITEM_PER_DROP; 869 int cnt = MAX_ITEM_PER_ACTION;
1017#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0) 870#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
1018 871
1019 /* loop while there are items on the floor that are not marked as 872 /* loop while there are items on the floor that are not marked as
1020 * destroyed */ 873 * destroyed */
1021 while (next && !next->destroyed ()) 874 while (next && !next->destroyed ())
… …
1037 890
1038 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) 891 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1039 { 892 {
1040 if (item_matched_string (op, tmp, op->contr->search_str)) 893 if (item_matched_string (op, tmp, op->contr->search_str))
1041 CHK_PICK_PICKUP; 894 CHK_PICK_PICKUP;
895
1042 continue; 896 continue;
1043 } 897 }
1044 898
1045 /* high not bit set? We're using the old autopickup model */ 899 /* pickup handling */
900 if (op->contr->mode & PU_DEBUG)
901 {
902 /* some debugging code to figure out item information */
903 const char *str = tmp->name
904 ? format ("item name: %s item type: %d weight/value: %d",
905 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))))
906 : format ("item name: %s item type: %d weight/value: %d",
907 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
908
909 new_draw_info (NDI_UNIQUE, 0, op, str);
910 }
911
912 if (op->contr->mode & PU_INHIBIT)
913 return 1;
914
915 if (!(op->contr->mode & PU_ENABLE)) // TODO: fix client
916 return 1;
917
918 /* philosophy:
919 * It's easy to grab an item type from a pile, as long as it's
920 * generic. This takes no game-time. For more detailed pickups
921 * and selections, select-items should be used. This is a
922 * grab-as-you-run type mode that's really useful for arrows for
923 * example.
924 * The drawback: right now it has no frontend, so you need to
925 * stick the bits you want into a calculator in hex mode and then
926 * convert to decimal and then 'pickup <#>
927 */
928
929 /* the first two modes are exclusive: if NOTHING we return, if
930 * STOP then we stop. All the rest are applied sequentially,
931 * meaning if any test passes, the item gets picked up. */
932
933 /* if mode is set to pick nothing up, return */
934 if (op->contr->mode == PU_NOTHING)
935 return 1;
936
937 /* if mode is set to stop when encountering objects, return */
938 /* take STOP before INHIBIT since it doesn't actually pick
939 * anything up */
940 if (op->contr->mode & PU_STOP)
941 return 0;
942
943 /* useful for going into stores and not losing your settings... */
944 /* and for battles wher you don't want to get loaded down while
945 * fighting */
946 if (op->contr->mode & PU_INHIBIT)
947 return 1;
948
949 /* prevent us from turning into auto-thieves :) */
950 if (QUERY_FLAG (tmp, FLAG_UNPAID))
951 continue;
952
953 /* ignore known cursed objects */
954 if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)
955 continue;
956
957 /* all food and drink if desired */
958 /* question: don't pick up known-poisonous stuff? */
1046 if (!(op->contr->mode & PU_NEWMODE)) 959 if (op->contr->mode & PU_FOOD)
960 if (tmp->type == FOOD)
1047 { 961 {
1048 switch (op->contr->mode) 962 CHK_PICK_PICKUP;
963 continue;
964 }
965
966 if (op->contr->mode & PU_DRINK)
967 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
968 {
969 CHK_PICK_PICKUP;
970 continue;
971 }
972
973 if (op->contr->mode & PU_POTION)
974 if (tmp->type == POTION)
975 {
976 CHK_PICK_PICKUP;
977 continue;
978 }
979
980 /* spellbooks, skillscrolls and normal books/scrolls */
981 if (op->contr->mode & PU_SPELLBOOK)
982 if (tmp->type == SPELLBOOK)
983 {
984 CHK_PICK_PICKUP;
985 continue;
986 }
987
988 if (op->contr->mode & PU_SKILLSCROLL)
989 if (tmp->type == SKILLSCROLL)
990 {
991 CHK_PICK_PICKUP;
992 continue;
993 }
994
995 if (op->contr->mode & PU_READABLES)
996 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
997 {
998 CHK_PICK_PICKUP;
999 continue;
1000 }
1001
1002 /* wands/staves/rods/horns */
1003 if (op->contr->mode & PU_MAGIC_DEVICE)
1004 if (tmp->type == WAND
1005 || tmp->type == ROD
1006 || tmp->type == HORN
1007 || tmp->type == POWER_CRYSTAL)
1008 {
1009 CHK_PICK_PICKUP;
1010 continue;
1011 }
1012
1013 /* pick up all magical items */
1014 if (op->contr->mode & PU_MAGICAL)
1015 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1016 && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1017 {
1018 CHK_PICK_PICKUP;
1019 continue;
1020 }
1021
1022 if (op->contr->mode & PU_VALUABLES)
1023 {
1024 if (tmp->type == MONEY || tmp->type == GEM)
1049 { 1025 {
1050 case 0:
1051 return 1; /* don't pick up */
1052 case 1:
1053 CHK_PICK_PICKUP; 1026 CHK_PICK_PICKUP;
1054 return 1; 1027 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 } 1028 }
1084 } 1029 }
1085 else 1030
1086 { /* old model */ 1031 /* rings & amulets - talismans seems to be typed AMULET */
1087 /* NEW pickup handling */
1088 if (op->contr->mode & PU_DEBUG) 1032 if (op->contr->mode & PU_JEWELS)
1033 if (tmp->type == RING
1034 || tmp->type == AMULET
1035 || tmp->type == GIRDLE
1036 || tmp->type == SKILL_TOOL)
1089 { 1037 {
1090 /* some debugging code to figure out item information */ 1038 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; 1039 continue;
1040 }
1137 1041
1138 /* ignore known cursed objects */ 1042 /* we don't forget dragon food */
1139 if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED) 1043 if (op->contr->mode & PU_FLESH)
1044 if (tmp->type == FLESH)
1045 {
1046 CHK_PICK_PICKUP;
1140 continue; 1047 continue;
1048 }
1141 1049
1142 /* all food and drink if desired */ 1050 /* bows and arrows. Bows are good for selling! */
1143 /* question: don't pick up known-poisonous stuff? */ 1051 if (op->contr->mode & PU_BOW)
1052 if (tmp->type == BOW)
1053 {
1054 CHK_PICK_PICKUP;
1055 continue;
1056 }
1057
1058 if (op->contr->mode & PU_ARROW)
1059 if (tmp->type == ARROW)
1060 {
1061 CHK_PICK_PICKUP;
1062 continue;
1063 }
1064
1065 /* all kinds of armor etc. */
1066 if (op->contr->mode & PU_ARMOUR)
1067 if (tmp->type == ARMOUR)
1068 {
1069 CHK_PICK_PICKUP;
1070 continue;
1071 }
1072
1073 if (op->contr->mode & PU_HELMET)
1074 if (tmp->type == HELMET)
1075 {
1076 CHK_PICK_PICKUP;
1077 continue;
1078 }
1079
1080 if (op->contr->mode & PU_SHIELD)
1081 if (tmp->type == SHIELD)
1082 {
1083 CHK_PICK_PICKUP;
1084 continue;
1085 }
1086
1144 if (op->contr->mode & PU_FOOD) 1087 if (op->contr->mode & PU_BOOTS)
1145 if (tmp->type == FOOD) 1088 if (tmp->type == BOOTS)
1089 {
1090 CHK_PICK_PICKUP;
1091 continue;
1092 }
1093
1094 if (op->contr->mode & PU_GLOVES)
1095 if (tmp->type == GLOVES || tmp->type == BRACERS)
1096 {
1097 CHK_PICK_PICKUP;
1098 continue;
1099 }
1100
1101 if (op->contr->mode & PU_CLOAK)
1102 if (tmp->type == CLOAK)
1103 {
1104 CHK_PICK_PICKUP;
1105 continue;
1106 }
1107
1108 /* hoping to catch throwing daggers here */
1109 if (op->contr->mode & PU_MISSILEWEAPON)
1110 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1111 {
1112 CHK_PICK_PICKUP;
1113 continue;
1114 }
1115
1116 /* careful: chairs and tables are weapons! */
1117 if (op->contr->mode & PU_ALLWEAPON)
1118 {
1119 if (tmp->type == WEAPON)
1120 if (!tmp->arch->archname.contains ("table") && !tmp->arch->archname.contains ("chair"))
1146 { 1121 {
1147 CHK_PICK_PICKUP; 1122 CHK_PICK_PICKUP;
1148 continue; 1123 continue;
1149 } 1124 }
1125 }
1150 1126
1127 /* misc stuff that's useful */
1151 if (op->contr->mode & PU_DRINK) 1128 if (op->contr->mode & PU_KEY)
1152 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 1129 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1153 { 1130 {
1154 CHK_PICK_PICKUP; 1131 CHK_PICK_PICKUP;
1155 continue; 1132 continue;
1156 } 1133 }
1157 1134
1135 /* any of the last 4 bits set means we use the ratio for value
1136 * pickups */
1158 if (op->contr->mode & PU_POTION) 1137 if (op->contr->mode & PU_RATIO)
1159 if (tmp->type == POTION) 1138 {
1139 /* use value density to decide what else to grab */
1140 /* >=7 was >= op->contr->mode */
1141 /* >=7 is the old standard setting. Now we take the last 4 bits
1160 { 1142 */
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) 1143 wvratio = op->contr->mode & PU_RATIO;
1197 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1144 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 { 1145 {
1205 if (tmp->type == MONEY || tmp->type == GEM) 1146#if 0
1147 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1148 if (tmp->name != NULL)
1206 { 1149 {
1207 CHK_PICK_PICKUP; 1150 fprintf (stderr, "%s", tmp->name);
1208 continue;
1209 } 1151 }
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 1152 else
1344 fprintf (stderr, "%s", tmp->arch->archname); 1153 fprintf (stderr, "%s", tmp->arch->archname);
1345 fprintf (stderr, ",%d] = ", tmp->type); 1154 fprintf (stderr, ",%d] = ", tmp->type);
1346 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1155 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1347#endif 1156#endif
1157 CHK_PICK_PICKUP;
1348 continue; 1158 continue;
1349 }
1350 } 1159 }
1351 } /* the new pickup model */ 1160 } /* the new pickup model */
1352 } 1161 }
1353 1162
1354 return !stop; 1163 return !stop;
1164}
1165
1166/* routine for both players and monsters. We call this when
1167 * there is a possibility for our action distrubing our hiding
1168 * place or invisiblity spell. Artefact invisiblity causes
1169 * "noise" instead. If we arent invisible to begin with, we
1170 * return 0.
1171 */
1172static int
1173action_makes_visible (object *op)
1174{
1175 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
1176 {
1177 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
1178 {
1179 // artefact invisibility is permanent, but we still make noise
1180 // this is important for game-balance.
1181 if (op->contr)
1182 op->make_noise ();
1183
1184 return 0;
1185 }
1186
1187 if (op->contr && op->contr->tmp_invis == 0)
1188 return 0;
1189
1190 /* If monsters, they should become visible */
1191 if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
1192 {
1193 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
1194 return 1;
1195 }
1196 }
1197
1198 return 0;
1355} 1199}
1356 1200
1357/* 1201/*
1358 * Find an arrow in the inventory and after that 1202 * Find an arrow in the inventory and after that
1359 * in the right type container (quiver). Pointer to the 1203 * in the right type container (quiver). Pointer to the
1360 * found object is returned. 1204 * found object is returned.
1361 */ 1205 */
1362object * 1206static object *
1363find_arrow (object *op, const char *type) 1207find_arrow (object *op, const char *type)
1364{ 1208{
1365 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1209 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1366 if (tmp->type == ARROW && !strcmp (&tmp->race, type)) 1210 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1367 return splay (tmp); 1211 return splay (tmp);
… …
1381 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1225 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1382 * against the target. A full test is not performed, simply a basic test 1226 * 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 1227 * 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. 1228 * the hall. Failing that it does it's best to pick the highest plus arrow.
1385 */ 1229 */
1386object * 1230static object *
1387find_better_arrow (object *op, object *target, const char *type, int *better) 1231find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1388{ 1232{
1389 object *tmp = NULL, *arrow, *ntmp; 1233 object *tmp = NULL, *arrow, *ntmp;
1390 int attacknum, attacktype, betterby = 0, i; 1234 int attacknum, attacktype, betterby = 0, i;
1391 1235
1392 if (!type) 1236 if (!type)
… …
1396 { 1240 {
1397 if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED)) 1241 if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))
1398 { 1242 {
1399 i = 0; 1243 i = 0;
1400 ntmp = find_better_arrow (arrow, target, type, &i); 1244 ntmp = find_better_arrow (arrow, target, type, &i);
1245
1401 if (i > betterby) 1246 if (i > betterby)
1402 { 1247 {
1403 tmp = ntmp; 1248 tmp = ntmp;
1404 betterby = i; 1249 betterby = i;
1405 } 1250 }
1406 } 1251 }
1407 else if (arrow->type == ARROW && arrow->race == type) 1252 else if (arrow->type == ARROW && arrow->race == type)
1408 { 1253 {
1409 /* allways prefer assasination/slaying */ 1254 /* allways prefer assasination/slaying */
1410 if (target->race && arrow->slaying && strstr (arrow->slaying, target->race)) 1255 if (target->race && arrow->slaying.contains (target->race))
1411 { 1256 {
1412 if (arrow->attacktype & AT_DEATH) 1257 if (arrow->attacktype & AT_DEATH)
1413 { 1258 {
1414 *better = 100; 1259 *better = 100;
1415 return arrow; 1260 return arrow;
… …
1430 { 1275 {
1431 tmp = arrow; 1276 tmp = arrow;
1432 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100; 1277 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1433 } 1278 }
1434 } 1279 }
1280
1435 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1281 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1436 { 1282 {
1437 tmp = arrow; 1283 tmp = arrow;
1438 betterby = 2 + arrow->magic + arrow->stats.dam; 1284 betterby = 2 + arrow->magic + arrow->stats.dam;
1439 } 1285 }
1286
1440 if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby) 1287 if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
1441 { 1288 {
1442 tmp = arrow; 1289 tmp = arrow;
1443 betterby = 1 + arrow->magic + arrow->stats.dam; 1290 betterby = 1 + arrow->magic + arrow->stats.dam;
1444 } 1291 }
1445 } 1292 }
1446 } 1293 }
1447 } 1294 }
1295
1448 if (tmp == NULL && arrow == NULL) 1296 if (tmp == NULL && arrow == NULL)
1449 return find_arrow (op, type); 1297 return find_arrow (op, type);
1450 1298
1451 *better = betterby; 1299 *better = betterby;
1452 return tmp; 1300 return tmp;
… …
1456 * find_better_arrow to find a decent arrow to use. 1304 * find_better_arrow to find a decent arrow to use.
1457 * op = the shooter 1305 * op = the shooter
1458 * type = bow->race 1306 * type = bow->race
1459 * dir = fire direction 1307 * dir = fire direction
1460 */ 1308 */
1461object * 1309static object *
1462pick_arrow_target (object *op, const char *type, int dir) 1310pick_arrow_target (object *op, shstr_cmp type, int dir)
1463{ 1311{
1464 object *tmp = NULL; 1312 object *tmp = NULL;
1465 maptile *m; 1313 maptile *m;
1466 int i, mflags, found, number; 1314 int i, mflags, found, number;
1467 sint16 x, y; 1315 sint16 x, y;
… …
1482 for (i = 0, found = 0; i < 20; i++) 1330 for (i = 0, found = 0; i < 20; i++)
1483 { 1331 {
1484 x += freearr_x[dir]; 1332 x += freearr_x[dir];
1485 y += freearr_y[dir]; 1333 y += freearr_y[dir];
1486 mflags = get_map_flags (m, &m, x, y, &x, &y); 1334 mflags = get_map_flags (m, &m, x, y, &x, &y);
1335
1487 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW) 1336 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1488 { 1337 {
1489 tmp = NULL; 1338 tmp = 0;
1490 break; 1339 break;
1491 } 1340 }
1492 else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW) 1341 else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
1493 { 1342 {
1494 /* This block presumes arrows and the like are MOVE_FLY_SLOW - 1343 /* This block presumes arrows and the like are MOVE_FLY_SLOW -
1495 * perhaps a bad assumption. 1344 * perhaps a bad assumption.
1496 */ 1345 */
1497 tmp = NULL; 1346 tmp = 0;
1498 break; 1347 break;
1499 } 1348 }
1349
1500 if (mflags & P_IS_ALIVE) 1350 if (mflags & P_IS_ALIVE)
1501 {
1502 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 1351 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1503 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 1352 if (QUERY_FLAG (tmp, FLAG_ALIVE))
1504 {
1505 found++;
1506 break;
1507 }
1508 if (found)
1509 break; 1353 break;
1510 }
1511 } 1354 }
1512 if (tmp == NULL) 1355
1356 if (!tmp)
1513 return find_arrow (op, type); 1357 return find_arrow (op, type);
1514 1358
1515 if (tmp->head) 1359 if (tmp->head)
1516 tmp = tmp->head; 1360 tmp = tmp->head;
1517 1361
… …
1557 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1401 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1558 return 0; 1402 return 0;
1559 } 1403 }
1560 1404
1561 // optimisation: move object to top so we will find it quickly again 1405 // optimisation: move object to top so we will find it quickly again
1562 if (bow->below) 1406 splay (bow);
1563 {
1564 bow->remove ();
1565 op->insert (bow);
1566 }
1567
1568 } 1407 }
1569 1408
1570 if (!bow->race || !bow->skill) 1409 if (!bow->race || !bow->skill)
1571 { 1410 {
1572 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1411 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
… …
1598 } 1437 }
1599 1438
1600 /* this should not happen, but sometimes does */ 1439 /* this should not happen, but sometimes does */
1601 if (arrow->nrof == 0) 1440 if (arrow->nrof == 0)
1602 { 1441 {
1442 LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1603 arrow->destroy (); 1443 arrow->destroy ();
1604 return 0; 1444 return 0;
1605 } 1445 }
1606 1446
1607 left = arrow; /* these are arrows left to the player */ 1447 left = arrow; /* these are arrows left to the player */
… …
1617 arrow->direction = dir; 1457 arrow->direction = dir;
1618 1458
1619 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */ 1459 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1620 arrow->stats.hp = arrow->stats.dam; 1460 arrow->stats.hp = arrow->stats.dam;
1621 arrow->stats.grace = arrow->attacktype; 1461 arrow->stats.grace = arrow->attacktype;
1622 1462 arrow->custom_name = arrow->slaying;
1623 if (arrow->slaying)
1624 arrow->spellarg = strdup (arrow->slaying);
1625 1463
1626#if 0 1464#if 0
1627 if (player *pl = op->contr) 1465 if (player *pl = op->contr)
1628 { 1466 {
1629 float speed = pl->weapon_sp; 1467 float speed = pl->weapon_sp;
… …
1691 * but monsters can't. Putting that code here 1529 * but monsters can't. Putting that code here
1692 * makes the fire_bow code much cleaner. 1530 * makes the fire_bow code much cleaner.
1693 * this function should only be called if 'op' is a player, 1531 * this function should only be called if 'op' is a player,
1694 * hence the function name. 1532 * hence the function name.
1695 */ 1533 */
1696int 1534static int
1697player_fire_bow (object *op, int dir) 1535player_fire_bow (object *op, int dir)
1698{ 1536{
1699 int ret = 0, wcmod = 0; 1537 int ret;
1700 1538
1701 if (op->contr->bowtype == bow_bestarrow) 1539 if (op->contr->bowtype == bow_bestarrow)
1702 { 1540 {
1703 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y); 1541 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1704 } 1542 }
1705 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1543 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1706 { 1544 {
1707 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1545 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); 1546 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1711 } 1547 }
1712 else if (op->contr->bowtype == bow_threewide) 1548 else if (op->contr->bowtype == bow_threewide)
1713 { 1549 {
1714 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1550 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)]); 1551 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)]); 1552 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);
1717 } 1553 }
1718 else if (op->contr->bowtype == bow_spreadshot) 1554 else if (op->contr->bowtype == bow_spreadshot)
1719 { 1555 {
1720 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1556 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); 1557 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); 1558 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1723 } 1559 }
1724 else 1560 else
1725 { 1561 {
… …
1731} 1567}
1732 1568
1733/* Fires a misc (wand/rod/horn) object in 'dir'. 1569/* Fires a misc (wand/rod/horn) object in 'dir'.
1734 * Broken apart from 'fire' to keep it more readable. 1570 * Broken apart from 'fire' to keep it more readable.
1735 */ 1571 */
1736void 1572static void
1737fire_misc_object (object *op, int dir) 1573fire_misc_object (object *op, int dir)
1738{ 1574{
1739 object *item = op->contr->ranged_ob; 1575 object *item = op->contr->ranged_ob;
1740 1576
1741 if (!item) 1577 if (!item)
… …
1763 return; 1599 return;
1764 } 1600 }
1765 } 1601 }
1766 else if (item->type == ROD || item->type == HORN) 1602 else if (item->type == ROD || item->type == HORN)
1767 { 1603 {
1768 sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace); 1604 sint16 spell_sp = max (item->inv->stats.sp, item->inv->stats.grace);
1769 1605
1770 // using the maximum of the rods charge allows at least one spell cast 1606 // using the maximum of the rods charge allows at least one spell cast
1771 // for a rod or horn, this fixes some broken rods. 1607 // for a rod or horn, this fixes some broken rods.
1772 if (item->stats.hp < MIN (spell_sp, item->stats.maxhp)) 1608 if (item->stats.hp < min (spell_sp, item->stats.maxhp))
1773 { 1609 {
1774 op->contr->play_sound (sound_find ("wand_poof")); 1610 op->contr->play_sound (sound_find ("wand_poof"));
1775 1611
1776 if (item->type == ROD) 1612 if (item->type == ROD)
1777 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1613 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
… …
1782 } 1618 }
1783 } 1619 }
1784 1620
1785 if (cast_spell (op, item, dir, item->inv, NULL)) 1621 if (cast_spell (op, item, dir, item->inv, NULL))
1786 { 1622 {
1787 SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */ 1623 item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
1624
1788 if (item->type == WAND) 1625 if (item->type == WAND)
1789 { 1626 {
1790 if (!(--item->stats.food)) 1627 if (!(--item->stats.food))
1791 { 1628 {
1792 object *tmp; 1629 object *tmp;
… …
1812bool 1649bool
1813fire (object *op, int dir) 1650fire (object *op, int dir)
1814{ 1651{
1815 int spellcost = 0; 1652 int spellcost = 0;
1816 1653
1817 /* check for loss of invisiblity/hide */
1818 if (action_makes_visible (op))
1819 make_visible (op);
1820
1821 player *pl = op->contr; 1654 player *pl = op->contr;
1822 1655
1823 if (pl->golem) 1656 if (pl->golem)
1824 { 1657 {
1825 control_golem (op->contr->golem, dir); 1658 control_golem (op->contr->golem, dir);
… …
1827 } 1660 }
1828 1661
1829 object *ob = pl->ranged_ob; 1662 object *ob = pl->ranged_ob;
1830 1663
1831 if (!ob) 1664 if (!ob)
1832 return false;
1833
1834 if (!op->change_weapon (ob))
1835 return false; 1665 return false;
1836 1666
1837 if (op->speed_left > 0.f) 1667 if (op->speed_left > 0.f)
1838 --op->speed_left; 1668 --op->speed_left;
1839 else 1669 else
1840 return false; 1670 return false;
1841 1671
1672 if (!op->change_weapon (ob))
1673 return false;
1674
1675 /* check for loss of invisiblity/hide */
1676 if (action_makes_visible (op))
1677 make_visible (op);
1678
1842 switch (ob->type) 1679 switch (ob->type)
1843 { 1680 {
1844 case BOW: 1681 case BOW:
1845 player_fire_bow (op, dir); 1682 player_fire_bow (op, dir);
1846 break; 1683 break;
1847 1684
1848 case SPELL: 1685 case SPELL:
1849 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0); 1686 spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1850 break; 1687 break;
1851 1688
1852 case BUILDER: 1689 case BUILDER:
1853 apply_map_builder (op, dir); 1690 apply_map_builder (op, dir);
1854 break; 1691 break;
… …
1863 } 1700 }
1864 1701
1865 return true; 1702 return true;
1866} 1703}
1867 1704
1868/* find_key 1705static object *
1869 * We try to find a key for the door as passed. If we find a key
1870 * and successfully use it, we return the key, otherwise NULL
1871 * This function merges both normal and locked door, since the logic
1872 * for both is the same - just the specific key is different.
1873 * pl is the player,
1874 * inv is the objects inventory to searched
1875 * door is the door we are trying to match against.
1876 * This function can be called recursively to search containers.
1877 */
1878object *
1879find_key (object *pl, object *container, object *door) 1706find_key_ (object *pl, object *container, object *door)
1880{ 1707{
1881 object *tmp, *key; 1708 object *tmp, *key;
1882 1709
1883 /* Should not happen, but sanity checking is never bad */ 1710 /* Should not happen, but sanity checking is never bad */
1884 if (!container->inv) 1711 if (!container->inv)
… …
1887 /* First, lets try to find a key in the top level inventory */ 1714 /* First, lets try to find a key in the top level inventory */
1888 for (tmp = container->inv; tmp; tmp = tmp->below) 1715 for (tmp = container->inv; tmp; tmp = tmp->below)
1889 { 1716 {
1890 if (door->type == DOOR && tmp->type == KEY) 1717 if (door->type == DOOR && tmp->type == KEY)
1891 break; 1718 break;
1719
1892 /* For sanity, we should really check door type, but other stuff 1720 /* For sanity, we should really check door type, but other stuff
1893 * (like containers) can be locked with special keys 1721 * (like containers) can be locked with special keys
1894 */ 1722 */
1895 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1723 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1896 break; 1724 break;
… …
1902 * a key, return 1730 * a key, return
1903 */ 1731 */
1904 if (!tmp) 1732 if (!tmp)
1905 { 1733 {
1906 for (tmp = container->inv; tmp; tmp = tmp->below) 1734 for (tmp = container->inv; tmp; tmp = tmp->below)
1907 {
1908 /* No reason to search empty containers */ 1735 /* No reason to search empty containers */
1909 if (tmp->type == CONTAINER && tmp->inv) 1736 if (tmp->type == CONTAINER && tmp->inv)
1910 {
1911 if ((key = find_key (pl, tmp, door))) 1737 if ((key = find_key_ (pl, tmp, door)))
1912 return key; 1738 return key;
1913 }
1914 }
1915 1739
1916 if (!tmp) 1740 if (!tmp)
1917 return NULL; 1741 return 0;
1918 } 1742 }
1919 1743
1920 /* We get down here if we have found a key. Now if its in a container, 1744 /* We get down here if we have found a key. Now if its in a container,
1921 * see if we actually want to use it 1745 * see if we actually want to use it
1922 */ 1746 */
1923 if (pl != container) 1747 if (pl != container)
1924 { 1748 {
1925 /* Only let players use keys in containers */ 1749 /* Only let players use keys in containers */
1926 if (!pl->contr) 1750 if (!pl->contr)
1927 return NULL; 1751 return 0;
1752
1928 /* cases where this fails: 1753 /* cases where this fails:
1929 * If we only search the player inventory, return now since we 1754 * If we only search the player inventory, return now since we
1930 * are not in the players inventory. 1755 * are not in the players inventory.
1931 * If the container is not active, return now since only active 1756 * If the container is not active, return now since only active
1932 * containers can be used. 1757 * containers can be used.
… …
1936 * inv must have been an container and must have been active. 1761 * inv must have been an container and must have been active.
1937 * 1762 *
1938 * Change the color so that the message doesn't disappear with 1763 * Change the color so that the message doesn't disappear with
1939 * all the others. 1764 * all the others.
1940 */ 1765 */
1941 if (pl->contr->usekeys == key_inventory || 1766 if (pl->contr->usekeys == key_inventory
1942 !QUERY_FLAG (container, FLAG_APPLIED) || 1767 || !QUERY_FLAG (container, FLAG_APPLIED)
1943 (pl->contr->usekeys == keyrings && (!container->race || strcmp (container->race, "keys")))) 1768 || (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1944 { 1769 {
1945 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1770 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1946 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1771 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1947 return NULL; 1772 return NULL;
1948 } 1773 }
1949 } 1774 }
1950 1775
1951 return tmp; 1776 return tmp;
1777}
1778
1779/* find_key
1780 * We try to find a key for the door as passed. If we find a key
1781 * and successfully use it, we return the key, otherwise NULL
1782 * This function merges both normal and locked door, since the logic
1783 * for both is the same - just the specific key is different.
1784 * pl is the player,
1785 * inv is the objects inventory to searched
1786 * door is the door we are trying to match against.
1787 * This function can be called recursively to search containers.
1788 */
1789object *
1790find_key (object *pl, object *container, object *door)
1791{
1792 if (door->slaying && is_match_expr (door->slaying))
1793 {
1794 // for match expressions, we try to find the key by applying the match
1795 // to the op itself, which is supposed to find the "key", instead
1796 // of searching through containers ourselves.
1797
1798 return match_one (door->slaying, container, door, pl, pl);
1799 }
1800 else
1801 return find_key_ (pl, container, door);
1952} 1802}
1953 1803
1954/* moved door processing out of move_player_attack. 1804/* moved door processing out of move_player_attack.
1955 * returns 1 if player has opened the door with a key 1805 * returns 1 if player has opened the door with a key
1956 * such that the caller should not do anything more, 1806 * such that the caller should not do anything more,
… …
2006 * going to try and move (not fire weapons). 1856 * going to try and move (not fire weapons).
2007 */ 1857 */
2008bool 1858bool
2009move_player_attack (object *op, int dir) 1859move_player_attack (object *op, int dir)
2010{ 1860{
1861 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
1862 {
1863 --op->speed_left;
1864 return true;
1865 }
1866
2011 int on_battleground; 1867 int on_battleground;
2012 1868
2013 sint16 nx = freearr_x[dir] + op->x; 1869 sint16 nx = freearr_x[dir] + op->x;
2014 sint16 ny = freearr_y[dir] + op->y; 1870 sint16 ny = freearr_y[dir] + op->y;
2015 1871
2016 on_battleground = op_on_battleground (op, 0, 0); 1872 on_battleground = op_on_battleground (op, 0, 0);
2017 1873
2018 if (out_of_map (op->map, nx, ny)) 1874 if (out_of_map (op->map, nx, ny))
2019 return false; 1875 return false;
2020
2021 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2022 {
2023 --op->speed_left;
2024 return true;
2025 }
2026 1876
2027 /* If braced, or can't move to the square, and it is not out of the 1877 /* If braced, or can't move to the square, and it is not out of the
2028 * map, attack it. Note order of if statement is important - don't 1878 * map, attack it. Note order of if statement is important - don't
2029 * want to be calling move_ob if braced, because move_ob will move the 1879 * want to be calling move_ob if braced, because move_ob will move the
2030 * player. This is a pretty nasty hack, because if we could 1880 * player. This is a pretty nasty hack, because if we could
… …
2090 --op->speed_left; 1940 --op->speed_left;
2091 1941
2092 op->play_sound (sound_find ("push_player")); 1942 op->play_sound (sound_find ("push_player"));
2093 push_ob (mon, dir, op); 1943 push_ob (mon, dir, op);
2094 1944
2095 if (op->contr->tmp_invis || op->hide) 1945 if (action_makes_visible (op))
2096 make_visible (op); 1946 make_visible (op);
2097 1947
2098 return true; 1948 return true;
2099 } 1949 }
2100 else 1950 else
… …
2122 push_ob (mon, dir, op); 1972 push_ob (mon, dir, op);
2123 } 1973 }
2124 else 1974 else
2125 op->statusmsg ("You withhold your attack"); 1975 op->statusmsg ("You withhold your attack");
2126 1976
2127 if (op->contr->tmp_invis || op->hide) 1977 if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2128 make_visible (op); 1978 make_visible (op);
2129 1979
2130 return true; 1980 return true;
2131 } 1981 }
2132 } 1982 }
… …
2172} 2022}
2173 2023
2174bool 2024bool
2175move_player (object *op, int dir) 2025move_player (object *op, int dir)
2176{ 2026{
2177 int pick;
2178
2179 if (!op->map || op->map->in_memory != MAP_ACTIVE) 2027 if (!op->map || op->map->in_memory != MAP_ACTIVE)
2180 return 0; 2028 return 0;
2181 2029
2182 /* Sanity check: make sure dir is valid */ 2030 /* Sanity check: make sure dir is valid */
2183 if ((dir < 0) || (dir >= 9)) 2031 if ((dir < 0) || (dir >= 9))
… …
2190 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2038 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2191 dir = absdir (dir + rndm (3) + rndm (3) - 2); 2039 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2192 2040
2193 op->facing = dir; 2041 op->facing = dir;
2194 2042
2195 if (op->hide) 2043 if (op->flag [FLAG_HIDDEN])
2196 do_hidden_move (op); 2044 do_hidden_move (op);
2197 2045
2198 bool retval; 2046 bool retval;
2047 int pick = 0;
2199 2048
2200 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2049 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2201 retval = RESULT_INT (0); 2050 retval = RESULT_INT (0);
2202 else if (op->contr->fire_on) 2051 else if (op->contr->fire_on)
2203 retval = fire (op, dir); 2052 retval = fire (op, dir);
… …
2260 return move_player (op, op->direction); 2109 return move_player (op, op->direction);
2261 2110
2262 return false; 2111 return false;
2263} 2112}
2264 2113
2265int 2114static int
2266save_life (object *op) 2115save_life (object *op)
2267{ 2116{
2268 if (!QUERY_FLAG (op, FLAG_LIFESAVE)) 2117 if (!QUERY_FLAG (op, FLAG_LIFESAVE))
2269 return 0; 2118 return 0;
2270 2119
… …
2317void 2166void
2318object::drop_unpaid_items () 2167object::drop_unpaid_items ()
2319{ 2168{
2320 if (!flag [FLAG_REMOVED]) 2169 if (!flag [FLAG_REMOVED])
2321 ::drop_unpaid_items (inv, this); 2170 ::drop_unpaid_items (inv, this);
2322}
2323
2324/*
2325 * Returns pointer a static string containing gravestone text
2326 * Moved from apply.c to player.c - player.c is what
2327 * actually uses this function. player.c may not be quite the
2328 * best, a misc file for object actions is probably better,
2329 * but there isn't one in the server directory.
2330 */
2331const char *
2332gravestone_text (object *op)
2333{
2334 static dynbuf_text buf;
2335
2336 buf << "---- R.I.P. ----\n\n";
2337 op->name;
2338
2339 if (op->type == PLAYER)
2340 buf << " the " << op->contr->title;
2341
2342 buf << "\n\n";
2343
2344 buf << "who was level ";
2345 buf << (sint32)op->level << "\n\n" // OO breakdown
2346 << " when " << (op->contr ? "killed" : "died") << "\n\n";
2347
2348 if (op->type == PLAYER)
2349 buf << "by " << op->contr->killer_name () << ".\n\n";
2350
2351 {
2352 static char buf2[128];
2353 time_t now = time (NULL);
2354 strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2355 buf << buf2;
2356 }
2357
2358 return buf;
2359} 2171}
2360 2172
2361void 2173void
2362do_some_living (object *op) 2174do_some_living (object *op)
2363{ 2175{
… …
2518 { 2330 {
2519 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp; 2331 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2520 2332
2521 if (over_hp > 0) 2333 if (over_hp > 0)
2522 { 2334 {
2523 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2335 op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2524 op->last_heal = 0; 2336 op->last_heal = 0;
2525 } 2337 }
2526 else 2338 else
2527 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2339 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2528 } 2340 }
… …
2544 op->stats.food--; 2356 op->stats.food--;
2545 } 2357 }
2546 2358
2547 if (op->stats.food < 0 && op->stats.hp >= 0) 2359 if (op->stats.food < 0 && op->stats.hp >= 0)
2548 { 2360 {
2549 object *tmp, *flesh = 0; 2361 object *flesh = 0;
2550 2362
2551 for (tmp = op->inv; tmp; tmp = tmp->below) 2363 for_inv_removable (op, tmp)
2552 { 2364 {
2553 if (!QUERY_FLAG (tmp, FLAG_UNPAID)) 2365 if (QUERY_FLAG (tmp, FLAG_UNPAID))
2366 continue;
2367
2368 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2554 { 2369 {
2555 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2370 op->statusmsg ("You blindly grab for a bite of food. "
2556 { 2371 "H<To prevent you from starving, you ate some random item from your backpack.>");
2557 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2558 manual_apply (op, tmp, 0); 2372 manual_apply (op, tmp, 0);
2373
2559 if (op->stats.food >= 0 || op->stats.hp < 0) 2374 if (op->stats.food >= 0 || op->stats.hp < 0)
2560 break; 2375 break;
2561 } 2376 }
2562 else if (tmp->type == FLESH) 2377 else if (tmp->type == FLESH)
2563 flesh = tmp; 2378 flesh = tmp;
2564 } /* End if paid for object */ 2379 }
2565 } /* end of for loop */
2566 2380
2567 /* If player is still starving, it means they don't have any food, so 2381 /* If player is still starving, it means they don't have any food, so
2568 * eat flesh instead. 2382 * eat flesh instead.
2569 */ 2383 */
2570 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2384 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2571 { 2385 {
2572 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2386 op->statusmsg ("You blindly grab for a bite of food. "
2387 "H<To prevent you from starving, you ate some random item from your backpack.>");
2573 manual_apply (op, flesh, 0); 2388 manual_apply (op, flesh, 0);
2574 } 2389 }
2390
2391 // If player is still starving, alert him!
2392 if (op->stats.food < 0)
2393 op->failmsg ("You are starving! "
2394 "H<Eat some food to increase your food and prevent you from an untimely death.>");
2575 } 2395 }
2576 2396
2577 if (op->stats.food < 0) 2397 if (op->stats.food < 0)
2578 { 2398 {
2579 op->stats.hp += op->stats.food; 2399 op->stats.hp += op->stats.food;
2580 op->stats.food = 0; 2400 op->stats.food = 0;
2401
2402 if (op->stats.hp < 0)
2403 {
2404 op->contr->killer = archetype::get ("killer_starvation");
2405 op->contr->killer->destroy ();
2581 } 2406 }
2407 }
2582 2408
2409 /* killer should be set here already */
2583 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2410 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2584 kill_player (op); 2411 kill_player (op);
2585 } 2412 }
2586} 2413}
2587 2414
… …
2592 */ 2419 */
2593void 2420void
2594kill_player (object *op) 2421kill_player (object *op)
2595{ 2422{
2596 int x, y; 2423 int x, y;
2597 char buf[MAX_BUF];
2598 maptile *map; /* this is for resurrection */ 2424 maptile *map; /* this is for resurrection */
2599 int will_kill_again; 2425 int will_kill_again;
2600 archetype *at; 2426 archetype *at;
2601 object *tmp; 2427 object *tmp;
2602 2428
2603 if (save_life (op)) 2429 if (save_life (op))
2604 return; 2430 return;
2431
2432 dynbuf_text deathtab;
2433
2434 /* restore player */
2435 at = archetype::find (shstr_poisoning);
2436 if (object *tmp = present_arch_in_ob (at, op))
2437 {
2438 tmp->destroy ();
2439 deathtab << "Your body feels cleansed...\r";
2440 }
2441
2442 at = archetype::find (shstr_confusion);
2443 if (object *tmp = present_arch_in_ob (at, op))
2444 {
2445 tmp->destroy ();
2446 deathtab << "Your mind feels clearer...\r";
2447 }
2448
2449 cure_disease (op, 0, 0); /* remove any disease */
2450
2451 max_it (op->stats.hp , op->stats.maxhp);
2452 max_it (op->stats.sp , op->stats.maxsp);
2453 max_it (op->stats.grace, op->stats.maxgrace);
2454
2455 if (op->stats.food <= 0)
2456 op->stats.food = 999;
2457
2458 // remove all spell effects that are active
2459 // to avoid long-term effects such as word-of-recall
2460 for (object *item = op->inv; item; )
2461 {
2462 object *next = item->below;
2463
2464 if (item->type == SPELL_EFFECT && item->active)
2465 item->destroy ();
2466
2467 item = next;
2468 }
2605 2469
2606 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2470 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2607 * in cities ONLY!!! It is very important that this doesn't get abused. 2471 * in cities ONLY!!! It is very important that this doesn't get abused.
2608 * Look at op_on_battleground() for more info --AndreasV 2472 * Look at op_on_battleground() for more info --AndreasV
2609 */ 2473 */
2610 if (op_on_battleground (op, &x, &y)) 2474 if (op_on_battleground (op, &x, &y))
2611 { 2475 {
2612 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); 2476 deathtab << "You almost died in combat, but local medics have saved your life...\r";
2613 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2614
2615 /* restore player */
2616 at = archetype::find ("poisoning");
2617 if (object *tmp = present_arch_in_ob (at, op))
2618 {
2619 tmp->destroy ();
2620 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2621 }
2622
2623 at = archetype::find ("confusion");
2624 if (object *tmp = present_arch_in_ob (at, op))
2625 {
2626 tmp->destroy ();
2627 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2628 }
2629
2630 cure_disease (op, 0, 0); /* remove any disease */
2631 op->stats.hp = op->stats.maxhp;
2632 if (op->stats.food <= 0)
2633 op->stats.food = 999;
2634 2477
2635 /* create a bodypart-trophy to make the winner happy */ 2478 /* create a bodypart-trophy to make the winner happy */
2636 if (object *tmp = arch_to_object (archetype::find ("finger"))) 2479 object *tmp = archetype::find (shstr_finger)->instance ();
2637 { 2480
2638 tmp->name = format ("%s's finger" , &op->name); 2481 tmp->name = format ("%s's finger" , &op->name);
2639 tmp->name_pl = format ("%s's fingers", &op->name); 2482 tmp->name_pl = format ("%s's fingers", &op->name);
2640 tmp->msg = format ( 2483 tmp->msg = format (
2641 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n", 2484 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2642 &op->name, op->contr->title, 2485 &op->name, op->contr->title,
2643 (int)op->level, 2486 (int)op->level,
2644 op->contr->killer_name () 2487 op->contr->killer_name ()
2645 ); 2488 );
2646 tmp->value = 0, tmp->type = 0; 2489 tmp->value = 0, tmp->type = 0;
2647 tmp->materialname = "organics"; 2490 tmp->material = name_to_material (shstr_organic);
2648 tmp->insert_at (op, tmp); 2491 tmp->insert_at (op, tmp);
2649 }
2650 2492
2651 /* teleport defeated player to new destination */ 2493 /* teleport defeated player to new destination */
2652 transfer_ob (op, x, y, 0, NULL); 2494 transfer_ob (op, x, y, 0, NULL);
2653 op->contr->braced = 0; 2495 op->contr->braced = 0;
2496
2497 op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2654 return; 2498 return;
2655 } 2499 }
2656 2500
2501 deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n";
2502 deathtab << "T<YOU HAVE DIED>\n\n";
2503
2657 INVOKE_PLAYER (DEATH, op->contr); 2504 INVOKE_PLAYER (DEATH, op->contr);
2658 2505
2659 command_kill_pets (op, 0); 2506 command_kill_pets (op, 0);
2660
2661 if (op->stats.food < 0)
2662 {
2663 op->contr->killer = archetype::get ("killer_starvation");
2664 op->contr->killer->destroy ();
2665 }
2666 2507
2667 op->contr->play_sound (sound_find ("player_dies")); 2508 op->contr->play_sound (sound_find ("player_dies"));
2668 2509
2669 /* save the map location for corpse, gravestone */ 2510 /* save the map location for corpse, gravestone */
2670 x = op->x; 2511 x = op->x;
… …
2700 2541
2701 lost_a_stat = 0; 2542 lost_a_stat = 0;
2702 2543
2703 for (z = 0; z < num_stats_lose; z++) 2544 for (z = 0; z < num_stats_lose; z++)
2704 { 2545 {
2705 i = RANDOM () % NUM_STATS; 2546 i = rndm (NUM_STATS);
2706 2547
2707 if (settings.stat_loss_on_death) 2548 if (settings.stat_loss_on_death)
2708 { 2549 {
2709 /* Pick a random stat and take a point off it. Tell the player 2550 /* Pick a random stat and take a point off it. Tell the player
2710 * what he lost. 2551 * what he lost.
… …
2717 lost_a_stat = 1; 2558 lost_a_stat = 1;
2718 } 2559 }
2719 else 2560 else
2720 { 2561 {
2721 /* deplete a stat */ 2562 /* deplete a stat */
2722 archetype *deparch = archetype::find ("depletion"); 2563 archetype *deparch = archetype::find (shstr_depletion);
2723 object *dep; 2564 object *dep;
2724 2565
2725 dep = present_arch_in_ob (deparch, op); 2566 dep = present_arch_in_ob (deparch, op);
2726 if (!dep) 2567 if (!dep)
2727 { 2568 {
2728 dep = arch_to_object (deparch); 2569 dep = deparch->instance ();
2729 insert_ob_in_ob (dep, op); 2570 insert_ob_in_ob (dep, op);
2730 } 2571 }
2731 lose_this_stat = 1; 2572 lose_this_stat = 1;
2732 if (settings.balanced_stat_loss) 2573 if (settings.balanced_stat_loss)
2733 { 2574 {
… …
2761 } 2602 }
2762 } 2603 }
2763 2604
2764 if (lose_this_stat) 2605 if (lose_this_stat)
2765 { 2606 {
2766 this_stat = get_attr_value (&(dep->stats), i); 2607 this_stat = get_attr_value (&dep->stats, i);
2767 /* We could try to do something clever like find another 2608 /* We could try to do something clever like find another
2768 * stat to reduce if this fails. But chances are, if 2609 * stat to reduce if this fails. But chances are, if
2769 * stats have been depleted to -50, all are pretty low 2610 * stats have been depleted to -50, all are pretty low
2770 * and should be roughly the same, so it shouldn't make a 2611 * and should be roughly the same, so it shouldn't make a
2771 * difference. 2612 * difference.
… …
2779 lost_a_stat = 1; 2620 lost_a_stat = 1;
2780 } 2621 }
2781 } 2622 }
2782 } 2623 }
2783 } 2624 }
2625
2784 /* If no stat lost, tell the player. */ 2626 /* If no stat lost, tell the player. */
2785 if (!lost_a_stat) 2627 if (!lost_a_stat)
2786 { 2628 {
2787 /* determine_god() seems to not work sometimes... why is this? 2629 /* determine_god() seems to not work sometimes... why is this?
2788 Should I be using something else? GD */ 2630 Should I be using something else? GD */
2789 const char *god = determine_god (op); 2631 shstr_tmp god = determine_god (op);
2790 2632
2791 if (god && (strcmp (god, "none"))) 2633 if (god != shstr_none)
2792 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god); 2634 deathtab << "For a brief moment you feel the holy presence of " << god << " protecting you.\r";
2793 else 2635 else
2794 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you."); 2636 deathtab << "For a brief moment you feel a holy presence protecting you.\r";
2795 } 2637 }
2796#else 2638#else
2797 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely."); 2639 deathtab << "For a brief moment you feel a holy presence protecting you from losing yourself completely.";
2798#endif 2640#endif
2799 2641
2800 /* Put a gravestone up where the character 'almost' died. List the 2642 /* Put a gravestone up where the character 'almost' died. List the
2801 * exp loss on the stone. 2643 * exp loss on the stone.
2802 */ 2644 */
2803 tmp = arch_to_object (archetype::find ("gravestone")); 2645 tmp = archetype::find (shstr_gravestone)->instance ();
2804 sprintf (buf, "%s's gravestone", &op->name); 2646 tmp->name = format ("%s's gravestone", &op->name);
2805 tmp->name = buf; 2647 tmp->name_pl = format ("%s's gravestones", &op->name);
2806 sprintf (buf, "%s's gravestones", &op->name); 2648 tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2807 tmp->name_pl = buf; 2649 &op->name, op->contr->title, op->contr->killer_name ());
2808 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_name ());
2809 tmp->msg = buf;
2810 tmp->x = op->x, tmp->y = op->y; 2650 tmp->x = op->x, tmp->y = op->y;
2811 insert_ob_in_map (tmp, op->map, NULL, 0); 2651 insert_ob_in_map (tmp, op->map, NULL, 0);
2812 2652
2813 /**************************************/ 2653 /**************************************/
2814 /* */ 2654 /* */
2815 /* Subtract the experience points, */ 2655 /* Subtract the experience points, */
2816 /* if we died cause of food, give us */
2817 /* food, and reset HP's... */
2818 /* */ 2656 /* */
2819 /**************************************/ 2657 /**************************************/
2820 2658
2821 /* remove any poisoning and confusion the character may be suffering. */
2822 /* restore player */
2823 at = archetype::find ("poisoning");
2824 tmp = present_arch_in_ob (at, op);
2825
2826 if (tmp)
2827 {
2828 tmp->destroy ();
2829 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2830 }
2831
2832 at = archetype::find ("confusion");
2833 tmp = present_arch_in_ob (at, op);
2834 if (tmp)
2835 {
2836 tmp->destroy ();
2837 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2838 }
2839
2840 cure_disease (op, 0, 0); /* remove any disease */
2841
2842 /*add_exp(op, (op->stats.exp * -0.20)); */ 2659 /*add_exp(op, (op->stats.exp * -0.20)); */
2843 apply_death_exp_penalty (op); 2660 apply_death_exp_penalty (op);
2844 if (op->stats.food < 100)
2845 op->stats.food = 900;
2846 op->stats.hp = op->stats.maxhp;
2847 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2848 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2849 2661
2850 /* 2662 /*
2851 * Check to see if the player has any unpaid items. If so, remove them 2663 * Check to see if the player has any unpaid items. If so, remove them
2852 * and put them back in the map. 2664 * and put them back in the map.
2853 */ 2665 */
… …
2888 if (will_kill_again & (1 << at)) 2700 if (will_kill_again & (1 << at))
2889 force->resist[at] = 100; 2701 force->resist[at] = 100;
2890 2702
2891 insert_ob_in_ob (force, op); 2703 insert_ob_in_ob (force, op);
2892 op->update_stats (); 2704 op->update_stats ();
2893
2894 } 2705 }
2895 2706
2896 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED."); 2707 op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2897} 2708}
2898 2709
2899void 2710static void
2900loot_object (object *op) 2711loot_object (object *op)
2901{ /* Grab and destroy some treasure */ 2712{ /* Grab and destroy some treasure */
2902 object *tmp, *tmp2, *next; 2713 object *tmp, *tmp2, *next;
2903 2714
2904 op->close_container (); /* close open sack first */ 2715 op->close_container (); /* close open sack first */
… …
2935 * fix_weight(): Check recursively the weight of all players, and fix 2746 * fix_weight(): Check recursively the weight of all players, and fix
2936 * what needs to be fixed. Refresh windows and fix speed if anything 2747 * what needs to be fixed. Refresh windows and fix speed if anything
2937 * was changed. 2748 * was changed.
2938 */ 2749 */
2939void 2750void
2940fix_weight (void) 2751fix_weight ()
2941{ 2752{
2942 for_all_players (pl) 2753 for_all_players (pl)
2943 { 2754 {
2944 sint32 old = pl->ob->carrying; 2755 sint32 old = pl->ob->carrying;
2945 2756
… …
2952 } 2763 }
2953 } 2764 }
2954} 2765}
2955 2766
2956void 2767void
2957fix_luck (void) 2768fix_luck ()
2958{ 2769{
2959 for_all_players (pl) 2770 for_all_players (pl)
2960 if (!pl->ob->contr->ns->state) 2771 if (!pl->ob->contr->ns->state)
2961 pl->ob->change_luck (0); 2772 pl->ob->change_luck (0);
2962} 2773}
… …
2999} 2810}
3000 2811
3001void 2812void
3002make_visible (object *op) 2813make_visible (object *op)
3003{ 2814{
3004 op->hide = 0; 2815 op->flag [FLAG_HIDDEN] = 0;
3005 op->invisible = 0; 2816 op->invisible = 0;
3006 2817
3007 if (op->type == PLAYER) 2818 if (op->type == PLAYER)
3008 { 2819 {
3009 op->contr->tmp_invis = 0; 2820 op->contr->tmp_invis = 0;
… …
3034 2845
3035 if (!ob || !ob->map) 2846 if (!ob || !ob->map)
3036 return 0; 2847 return 0;
3037 2848
3038 /* so, on normal lighted maps, its hard to hide */ 2849 /* so, on normal lighted maps, its hard to hide */
3039 level = ob->map->darkness - 2; 2850 level = ob->map->darklevel () - 2;
3040 2851
3041 /* this also picks up whether the object is glowing. 2852 /* this also picks up whether the object is glowing.
3042 * If you carry a light on a non-dark map, its not 2853 * If you carry a light on a non-dark map, its not
3043 * as bad as carrying a light on a pitch dark map */ 2854 * as bad as carrying a light on a pitch dark map */
3044 if (has_carried_lights (ob)) 2855 if (ob->has_carried_lights ())
3045 level = -(10 + (2 * ob->map->darkness)); 2856 level = -(10 + (2 * ob->map->darklevel ()));
3046 2857
3047 /* scan through all nearby squares for terrain to hide in */ 2858 /* scan through all nearby squares for terrain to hide in */
3048 for (i = 0, x = ob->x, y = ob->y; 2859 for (i = 0, x = ob->x, y = ob->y;
3049 i <= SIZEOFFREE1; 2860 i <= SIZEOFFREE1;
3050 i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i]) 2861 i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
… …
3071 * spot (surrounded by clear terrain in broad daylight). -b.t. 2882 * spot (surrounded by clear terrain in broad daylight). -b.t.
3072 */ 2883 */
3073void 2884void
3074do_hidden_move (object *op) 2885do_hidden_move (object *op)
3075{ 2886{
3076 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 2887 int hide = 0;
3077 object *skop;
3078 2888
3079 if (!op || !op->map) 2889 if (!op || !op->map)
3080 return; 2890 return;
3081 2891
3082 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 2892 object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
2893 int num = random_roll (0, 19, op, PREFER_LOW);
3083 2894
3084 /* its *extremely* hard to run and sneak/hide at the same time! */ 2895 /* its *extremely* hard to run and sneak/hide at the same time! */
3085 if (op->type == PLAYER && op->contr->run_on) 2896 if (op->type == PLAYER && op->contr->run_on)
3086 if (!skop || num >= skop->level) 2897 if (!skop || num >= skop->level)
3087 { 2898 {
… …
3097 num -= hide; 2908 num -= hide;
3098 2909
3099 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 2910 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3100 { 2911 {
3101 make_visible (op); 2912 make_visible (op);
2913
3102 if (op->type == PLAYER) 2914 if (op->type == PLAYER)
3103 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 2915 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3104 } 2916 }
3105 else if (op->type == PLAYER && skop) 2917 else if (op->type == PLAYER && skop)
3106 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 2918 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
… …
3196 while (op) 3008 while (op)
3197 { 3009 {
3198 dx = rv.distance_x + op->arch->x; 3010 dx = rv.distance_x + op->arch->x;
3199 dy = rv.distance_y + op->arch->y; 3011 dy = rv.distance_y + op->arch->y;
3200 3012
3201 /* only the viewable area the player sees is updated by LOS 3013 if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
3202 * code, so we need to restrict ourselves to that range of values
3203 * for any meaningful values.
3204 */
3205 if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3206 abs (dy) <= (pl->contr->ns->mapy / 2) &&
3207 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3208 return 1; 3014 return 1;
3209 3015
3210 op = op->more; 3016 op = op->more;
3211 }
3212
3213 return 0;
3214}
3215
3216/* routine for both players and monsters. We call this when
3217 * there is a possibility for our action distrubing our hiding
3218 * place or invisiblity spell. Artefact invisiblity is not
3219 * effected by this. If we arent invisible to begin with, we
3220 * return 0.
3221 */
3222int
3223action_makes_visible (object *op)
3224{
3225 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3226 {
3227 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3228 return 0;
3229
3230 if (op->contr && op->contr->tmp_invis == 0)
3231 return 0;
3232
3233 /* If monsters, they should become visible */
3234 if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis))
3235 {
3236 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3237 return 1;
3238 }
3239 } 3017 }
3240 3018
3241 return 0; 3019 return 0;
3242} 3020}
3243 3021
… …
3445 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg); 3223 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3446 } 3224 }
3447 else 3225 else
3448 { 3226 {
3449 /* generate misc. treasure */ 3227 /* generate misc. treasure */
3450 tmp = arch_to_object (tr->item); 3228 tmp = tr->item->instance ();
3451 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp)); 3229 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3452 who->insert (tmp); 3230 who->insert (tmp);
3453 } 3231 }
3454} 3232}
3455 3233
… …
3468 3246
3469 if (pl->ranged_ob == ob) 3247 if (pl->ranged_ob == ob)
3470 pl->ranged_ob = 0; 3248 pl->ranged_ob = 0;
3471} 3249}
3472 3250
3251//-GPL
3252
3473sint8 3253sint8
3474player::visibility_at (maptile *map, int x, int y) const 3254player::darkness_at (maptile *map, int x, int y) const
3475{ 3255{
3476 if (!ns) 3256 if (!ns)
3477 return 0; 3257 return LOS_BLOCKED;
3478 3258
3479 int dx, dy; 3259 int dx, dy;
3480 if (!adjacent_map (map, ns->current_map, &dx, &dy)) 3260 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3481 return 0; 3261 return LOS_BLOCKED;
3482 3262
3483 x += dx - ns->current_x + ns->mapx / 2; 3263 x += dx - ns->current_x;
3484 y += dy - ns->current_y + ns->mapy / 2; 3264 y += dy - ns->current_y;
3485 3265
3486 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3487 return 0;
3488
3489 return 100 - blocked_los [x][y]; 3266 return blocked_los (x, y);
3490} 3267}
3491 3268
3492void 3269void
3493player::infobox (const char *title, const char *msg, int color) 3270player::infobox (const char *title, const char *msg, int color)
3494{ 3271{

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines