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.198 by root, Sat May 17 00:17:02 2008 UTC vs.
Revision 1.256 by root, Fri Mar 26 00:59:22 2010 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 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 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 (ob->is_dragon ())
229 { 116 {
230 object *tmp, *abil = 0, *skin = 0; 117 object *tmp, *abil = 0, *skin = 0;
231 118
232 for (tmp = ob->inv; tmp; tmp = tmp->below) 119 for (tmp = ob->inv; tmp; tmp = tmp->below)
233 if (tmp->type == FORCE) 120 if (tmp->type == FORCE)
… …
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);
… …
868 ob->msg = 0; 756 ob->msg = 0;
869 757
870 start_info (ob); 758 start_info (ob);
871 CLEAR_FLAG (ob, FLAG_WIZ); 759 CLEAR_FLAG (ob, FLAG_WIZ);
872 give_initial_items (ob, ob->randomitems); 760 give_initial_items (ob, ob->randomitems);
873 link_player_skills (ob);
874 esrv_send_inventory (ob, ob); 761 esrv_send_inventory (ob, ob);
875 ob->update_stats (); 762 ob->update_stats ();
876 763
877 /* This moves the player to a different start map, if there 764 /* This moves the player to a different start map, if there
878 * is one for this race 765 * is one for this race
… …
917 ob->stats.hp = ob->stats.maxhp; 804 ob->stats.hp = ob->stats.maxhp;
918 ob->stats.sp = ob->stats.maxsp; 805 ob->stats.sp = ob->stats.maxsp;
919 ob->stats.grace = 0; 806 ob->stats.grace = 0;
920} 807}
921 808
922void 809static void
923flee_player (object *op) 810flee_player (object *op)
924{ 811{
925 int dir, diff; 812 int dir, diff;
926 rv_vector rv; 813 rv_vector rv;
927 814
… …
930 LOG (llevDebug, "Fleeing player is dead.\n"); 817 LOG (llevDebug, "Fleeing player is dead.\n");
931 CLEAR_FLAG (op, FLAG_SCARED); 818 CLEAR_FLAG (op, FLAG_SCARED);
932 return; 819 return;
933 } 820 }
934 821
935 if (op->enemy == NULL) 822 if (!op->enemy)
936 { 823 {
937 LOG (llevDebug, "Fleeing player had no enemy.\n"); 824 LOG (llevDebug, "Fleeing player had no enemy.\n");
938 CLEAR_FLAG (op, FLAG_SCARED); 825 CLEAR_FLAG (op, FLAG_SCARED);
939 return; 826 return;
940 } 827 }
941 828
942 /* Seen some crashes here. Since we don't store an
943 * op->enemy_count, it is possible that something destroys the
944 * actual enemy, and the object is recycled.
945 */
946 if (op->enemy->map == NULL)
947 {
948 CLEAR_FLAG (op, FLAG_SCARED);
949 op->enemy = NULL;
950 return;
951 }
952
953 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))
954 { 830 {
955 op->enemy = NULL; 831 op->enemy = NULL;
956 CLEAR_FLAG (op, FLAG_SCARED); 832 CLEAR_FLAG (op, FLAG_SCARED);
957 return; 833 return;
… …
960 get_rangevector (op, op->enemy, &rv, 0); 836 get_rangevector (op, op->enemy, &rv, 0);
961 837
962 dir = absdir (4 + rv.direction); 838 dir = absdir (4 + rv.direction);
963 for (diff = 0; diff < 3; diff++) 839 for (diff = 0; diff < 3; diff++)
964 { 840 {
965 int m = 1 - (RANDOM () & 2); 841 int m = 1 - rndm (2) * 2;
966 842
967 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op))) 843 if (op->move (absdir (dir + diff * m)) || (diff == 0 && op->move (absdir (dir - diff * m))))
968 return; 844 return;
969 } 845 }
970 846
971 /* Cornered, get rid of scared */ 847 /* Cornered, get rid of scared */
972 CLEAR_FLAG (op, FLAG_SCARED); 848 CLEAR_FLAG (op, FLAG_SCARED);
… …
981check_pick (object *op) 857check_pick (object *op)
982{ 858{
983 object *tmp, *next; 859 object *tmp, *next;
984 int stop = 0; 860 int stop = 0;
985 int wvratio; 861 int wvratio;
986 char putstring[128];
987 862
988 /* if you're flying, you cna't pick up anything */ 863 /* if you're flying, you cna't pick up anything */
989 if (op->move_type & MOVE_FLYING) 864 if (op->move_type & MOVE_FLYING)
990 return 1; 865 return 1;
991 866
992 next = op->below; 867 next = op->below;
993 868
994 int cnt = MAX_ITEM_PER_DROP; 869 int cnt = MAX_ITEM_PER_ACTION;
995#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)
996 871
997 /* 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
998 * destroyed */ 873 * destroyed */
999 while (next && !next->destroyed ()) 874 while (next && !next->destroyed ())
… …
1015 890
1016 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) 891 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1017 { 892 {
1018 if (item_matched_string (op, tmp, op->contr->search_str)) 893 if (item_matched_string (op, tmp, op->contr->search_str))
1019 CHK_PICK_PICKUP; 894 CHK_PICK_PICKUP;
895
1020 continue; 896 continue;
1021 } 897 }
1022 898
1023 /* 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? */
1024 if (!(op->contr->mode & PU_NEWMODE)) 959 if (op->contr->mode & PU_FOOD)
960 if (tmp->type == FOOD)
1025 { 961 {
1026 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)
1027 { 1025 {
1028 case 0:
1029 return 1; /* don't pick up */
1030 case 1:
1031 CHK_PICK_PICKUP; 1026 CHK_PICK_PICKUP;
1032 return 1; 1027 continue;
1033 case 2:
1034 CHK_PICK_PICKUP;
1035 return 0;
1036 case 3:
1037 return 0; /* stop before pickup */
1038 case 4:
1039 CHK_PICK_PICKUP;
1040 break;
1041 case 5:
1042 CHK_PICK_PICKUP;
1043 stop = 1;
1044 break;
1045 case 6:
1046 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1047 && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1048 CHK_PICK_PICKUP;
1049 break;
1050
1051 case 7:
1052 if (tmp->type == MONEY || tmp->type == GEM)
1053 CHK_PICK_PICKUP;
1054 break;
1055
1056 default:
1057 /* use value density */
1058 if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1059 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1060 CHK_PICK_PICKUP;
1061 } 1028 }
1062 } 1029 }
1063 else 1030
1064 { /* old model */ 1031 /* rings & amulets - talismans seems to be typed AMULET */
1065 /* NEW pickup handling */
1066 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)
1067 { 1037 {
1068 /* some debugging code to figure out item information */ 1038 CHK_PICK_PICKUP;
1069 if (tmp->name != NULL)
1070 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1071 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1072 else
1073 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1074 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1075
1076 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1077 }
1078
1079 /* philosophy:
1080 * It's easy to grab an item type from a pile, as long as it's
1081 * generic. This takes no game-time. For more detailed pickups
1082 * and selections, select-items should be used. This is a
1083 * grab-as-you-run type mode that's really useful for arrows for
1084 * example.
1085 * The drawback: right now it has no frontend, so you need to
1086 * stick the bits you want into a calculator in hex mode and then
1087 * convert to decimal and then 'pickup <#>
1088 */
1089
1090 /* the first two modes are exclusive: if NOTHING we return, if
1091 * STOP then we stop. All the rest are applied sequentially,
1092 * meaning if any test passes, the item gets picked up. */
1093
1094 /* if mode is set to pick nothing up, return */
1095
1096 if (op->contr->mode & PU_NOTHING)
1097 return 1;
1098
1099 /* if mode is set to stop when encountering objects, return */
1100 /* take STOP before INHIBIT since it doesn't actually pick
1101 * anything up */
1102
1103 if (op->contr->mode & PU_STOP)
1104 return 0;
1105
1106 /* useful for going into stores and not losing your settings... */
1107 /* and for battles wher you don't want to get loaded down while
1108 * fighting */
1109 if (op->contr->mode & PU_INHIBIT)
1110 return 1;
1111
1112 /* prevent us from turning into auto-thieves :) */
1113 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1114 continue; 1039 continue;
1040 }
1115 1041
1116 /* ignore known cursed objects */ 1042 /* we don't forget dragon food */
1117 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;
1118 continue; 1047 continue;
1048 }
1119 1049
1120 /* all food and drink if desired */ 1050 /* bows and arrows. Bows are good for selling! */
1121 /* 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
1122 if (op->contr->mode & PU_FOOD) 1087 if (op->contr->mode & PU_BOOTS)
1123 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"))
1124 { 1121 {
1125 CHK_PICK_PICKUP; 1122 CHK_PICK_PICKUP;
1126 continue; 1123 continue;
1127 } 1124 }
1125 }
1128 1126
1127 /* misc stuff that's useful */
1129 if (op->contr->mode & PU_DRINK) 1128 if (op->contr->mode & PU_KEY)
1130 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 1129 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1131 { 1130 {
1132 CHK_PICK_PICKUP; 1131 CHK_PICK_PICKUP;
1133 continue; 1132 continue;
1134 } 1133 }
1135 1134
1135 /* any of the last 4 bits set means we use the ratio for value
1136 * pickups */
1136 if (op->contr->mode & PU_POTION) 1137 if (op->contr->mode & PU_RATIO)
1137 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
1138 { 1142 */
1139 CHK_PICK_PICKUP;
1140 continue;
1141 }
1142
1143 /* spellbooks, skillscrolls and normal books/scrolls */
1144 if (op->contr->mode & PU_SPELLBOOK)
1145 if (tmp->type == SPELLBOOK)
1146 {
1147 CHK_PICK_PICKUP;
1148 continue;
1149 }
1150
1151 if (op->contr->mode & PU_SKILLSCROLL)
1152 if (tmp->type == SKILLSCROLL)
1153 {
1154 CHK_PICK_PICKUP;
1155 continue;
1156 }
1157
1158 if (op->contr->mode & PU_READABLES)
1159 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1160 {
1161 CHK_PICK_PICKUP;
1162 continue;
1163 }
1164
1165 /* wands/staves/rods/horns */
1166 if (op->contr->mode & PU_MAGIC_DEVICE)
1167 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1168 {
1169 CHK_PICK_PICKUP;
1170 continue;
1171 }
1172
1173 /* pick up all magical items */
1174 if (op->contr->mode & PU_MAGICAL) 1143 wvratio = op->contr->mode & PU_RATIO;
1175 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)
1176 {
1177 CHK_PICK_PICKUP;
1178 continue;
1179 }
1180
1181 if (op->contr->mode & PU_VALUABLES)
1182 { 1145 {
1183 if (tmp->type == MONEY || tmp->type == GEM) 1146#if 0
1147 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1148 if (tmp->name != NULL)
1184 { 1149 {
1185 CHK_PICK_PICKUP; 1150 fprintf (stderr, "%s", tmp->name);
1186 continue;
1187 } 1151 }
1188 }
1189
1190 /* rings & amulets - talismans seems to be typed AMULET */
1191 if (op->contr->mode & PU_JEWELS)
1192 if (tmp->type == RING || tmp->type == AMULET)
1193 {
1194 CHK_PICK_PICKUP;
1195 continue;
1196 }
1197
1198 /* we don't forget dragon food */
1199 if (op->contr->mode & PU_FLESH)
1200 if (tmp->type == FLESH)
1201 {
1202 CHK_PICK_PICKUP;
1203 continue;
1204 }
1205
1206 /* bows and arrows. Bows are good for selling! */
1207 if (op->contr->mode & PU_BOW)
1208 if (tmp->type == BOW)
1209 {
1210 CHK_PICK_PICKUP;
1211 continue;
1212 }
1213
1214 if (op->contr->mode & PU_ARROW)
1215 if (tmp->type == ARROW)
1216 {
1217 CHK_PICK_PICKUP;
1218 continue;
1219 }
1220
1221 /* all kinds of armor etc. */
1222 if (op->contr->mode & PU_ARMOUR)
1223 if (tmp->type == ARMOUR)
1224 {
1225 CHK_PICK_PICKUP;
1226 continue;
1227 }
1228
1229 if (op->contr->mode & PU_HELMET)
1230 if (tmp->type == HELMET)
1231 {
1232 CHK_PICK_PICKUP;
1233 continue;
1234 }
1235
1236 if (op->contr->mode & PU_SHIELD)
1237 if (tmp->type == SHIELD)
1238 {
1239 CHK_PICK_PICKUP;
1240 continue;
1241 }
1242
1243 if (op->contr->mode & PU_BOOTS)
1244 if (tmp->type == BOOTS)
1245 {
1246 CHK_PICK_PICKUP;
1247 continue;
1248 }
1249
1250 if (op->contr->mode & PU_GLOVES)
1251 if (tmp->type == GLOVES)
1252 {
1253 CHK_PICK_PICKUP;
1254 continue;
1255 }
1256
1257 if (op->contr->mode & PU_CLOAK)
1258 if (tmp->type == CLOAK)
1259 {
1260 CHK_PICK_PICKUP;
1261 continue;
1262 }
1263
1264 /* hoping to catch throwing daggers here */
1265 if (op->contr->mode & PU_MISSILEWEAPON)
1266 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1267 {
1268 CHK_PICK_PICKUP;
1269 continue;
1270 }
1271
1272 /* careful: chairs and tables are weapons! */
1273 if (op->contr->mode & PU_ALLWEAPON)
1274 {
1275 if (tmp->type == WEAPON && tmp->name != NULL)
1276 {
1277 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1278 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1279 {
1280 CHK_PICK_PICKUP;
1281 continue;
1282 }
1283 }
1284
1285 if (tmp->type == WEAPON && tmp->name == NULL)
1286 {
1287 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1288 {
1289 CHK_PICK_PICKUP;
1290 continue;
1291 }
1292 }
1293 }
1294
1295 /* misc stuff that's useful */
1296 if (op->contr->mode & PU_KEY)
1297 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1298 {
1299 CHK_PICK_PICKUP;
1300 continue;
1301 }
1302
1303 /* any of the last 4 bits set means we use the ratio for value
1304 * pickups */
1305 if (op->contr->mode & PU_RATIO)
1306 {
1307 /* use value density to decide what else to grab */
1308 /* >=7 was >= op->contr->mode */
1309 /* >=7 is the old standard setting. Now we take the last 4 bits
1310 * and multiply them by 5, giving 0..15*5== 5..75 */
1311 wvratio = (op->contr->mode & PU_RATIO) * 5;
1312 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1313 {
1314 CHK_PICK_PICKUP;
1315#if 0
1316 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1317 if (tmp->name != NULL)
1318 {
1319 fprintf (stderr, "%s", tmp->name);
1320 }
1321 else 1152 else
1322 fprintf (stderr, "%s", tmp->arch->archname); 1153 fprintf (stderr, "%s", tmp->arch->archname);
1323 fprintf (stderr, ",%d] = ", tmp->type); 1154 fprintf (stderr, ",%d] = ", tmp->type);
1324 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))));
1325#endif 1156#endif
1157 CHK_PICK_PICKUP;
1326 continue; 1158 continue;
1327 }
1328 } 1159 }
1329 } /* the new pickup model */ 1160 } /* the new pickup model */
1330 } 1161 }
1331 1162
1332 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;
1333} 1199}
1334 1200
1335/* 1201/*
1336 * Find an arrow in the inventory and after that 1202 * Find an arrow in the inventory and after that
1337 * in the right type container (quiver). Pointer to the 1203 * in the right type container (quiver). Pointer to the
1338 * found object is returned. 1204 * found object is returned.
1339 */ 1205 */
1340object * 1206static object *
1341find_arrow (object *op, const char *type) 1207find_arrow (object *op, const char *type)
1342{ 1208{
1343 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1209 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1344 if (tmp->type == ARROW && !strcmp (&tmp->race, type)) 1210 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1345 return splay (tmp); 1211 return splay (tmp);
… …
1359 * 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
1360 * 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
1361 * 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
1362 * 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.
1363 */ 1229 */
1364object * 1230static object *
1365find_better_arrow (object *op, object *target, const char *type, int *better) 1231find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1366{ 1232{
1367 object *tmp = NULL, *arrow, *ntmp; 1233 object *tmp = NULL, *arrow, *ntmp;
1368 int attacknum, attacktype, betterby = 0, i; 1234 int attacknum, attacktype, betterby = 0, i;
1369 1235
1370 if (!type) 1236 if (!type)
… …
1374 { 1240 {
1375 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))
1376 { 1242 {
1377 i = 0; 1243 i = 0;
1378 ntmp = find_better_arrow (arrow, target, type, &i); 1244 ntmp = find_better_arrow (arrow, target, type, &i);
1245
1379 if (i > betterby) 1246 if (i > betterby)
1380 { 1247 {
1381 tmp = ntmp; 1248 tmp = ntmp;
1382 betterby = i; 1249 betterby = i;
1383 } 1250 }
1384 } 1251 }
1385 else if (arrow->type == ARROW && arrow->race == type) 1252 else if (arrow->type == ARROW && arrow->race == type)
1386 { 1253 {
1387 /* allways prefer assasination/slaying */ 1254 /* allways prefer assasination/slaying */
1388 if (target->race && arrow->slaying && strstr (arrow->slaying, target->race)) 1255 if (target->race && arrow->slaying.contains (target->race))
1389 { 1256 {
1390 if (arrow->attacktype & AT_DEATH) 1257 if (arrow->attacktype & AT_DEATH)
1391 { 1258 {
1392 *better = 100; 1259 *better = 100;
1393 return arrow; 1260 return arrow;
… …
1408 { 1275 {
1409 tmp = arrow; 1276 tmp = arrow;
1410 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;
1411 } 1278 }
1412 } 1279 }
1280
1413 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1281 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1414 { 1282 {
1415 tmp = arrow; 1283 tmp = arrow;
1416 betterby = 2 + arrow->magic + arrow->stats.dam; 1284 betterby = 2 + arrow->magic + arrow->stats.dam;
1417 } 1285 }
1286
1418 if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby) 1287 if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
1419 { 1288 {
1420 tmp = arrow; 1289 tmp = arrow;
1421 betterby = 1 + arrow->magic + arrow->stats.dam; 1290 betterby = 1 + arrow->magic + arrow->stats.dam;
1422 } 1291 }
… …
1435 * find_better_arrow to find a decent arrow to use. 1304 * find_better_arrow to find a decent arrow to use.
1436 * op = the shooter 1305 * op = the shooter
1437 * type = bow->race 1306 * type = bow->race
1438 * dir = fire direction 1307 * dir = fire direction
1439 */ 1308 */
1440object * 1309static object *
1441pick_arrow_target (object *op, const char *type, int dir) 1310pick_arrow_target (object *op, shstr_cmp type, int dir)
1442{ 1311{
1443 object *tmp = NULL; 1312 object *tmp = NULL;
1444 maptile *m; 1313 maptile *m;
1445 int i, mflags, found, number; 1314 int i, mflags, found, number;
1446 sint16 x, y; 1315 sint16 x, y;
… …
1461 for (i = 0, found = 0; i < 20; i++) 1330 for (i = 0, found = 0; i < 20; i++)
1462 { 1331 {
1463 x += freearr_x[dir]; 1332 x += freearr_x[dir];
1464 y += freearr_y[dir]; 1333 y += freearr_y[dir];
1465 mflags = get_map_flags (m, &m, x, y, &x, &y); 1334 mflags = get_map_flags (m, &m, x, y, &x, &y);
1335
1466 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW) 1336 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1467 { 1337 {
1468 tmp = NULL; 1338 tmp = 0;
1469 break; 1339 break;
1470 } 1340 }
1471 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)
1472 { 1342 {
1473 /* This block presumes arrows and the like are MOVE_FLY_SLOW - 1343 /* This block presumes arrows and the like are MOVE_FLY_SLOW -
1474 * perhaps a bad assumption. 1344 * perhaps a bad assumption.
1475 */ 1345 */
1476 tmp = NULL; 1346 tmp = 0;
1477 break; 1347 break;
1478 } 1348 }
1349
1479 if (mflags & P_IS_ALIVE) 1350 if (mflags & P_IS_ALIVE)
1480 {
1481 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)
1482 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 1352 if (QUERY_FLAG (tmp, FLAG_ALIVE))
1483 {
1484 found++;
1485 break;
1486 }
1487 if (found)
1488 break; 1353 break;
1489 }
1490 } 1354 }
1491 if (tmp == NULL) 1355
1356 if (!tmp)
1492 return find_arrow (op, type); 1357 return find_arrow (op, type);
1493 1358
1494 if (tmp->head) 1359 if (tmp->head)
1495 tmp = tmp->head; 1360 tmp = tmp->head;
1496 1361
… …
1536 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1401 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1537 return 0; 1402 return 0;
1538 } 1403 }
1539 1404
1540 // 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
1541 if (bow->below) 1406 splay (bow);
1542 {
1543 bow->remove ();
1544 op->insert (bow);
1545 }
1546
1547 } 1407 }
1548 1408
1549 if (!bow->race || !bow->skill) 1409 if (!bow->race || !bow->skill)
1550 { 1410 {
1551 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);
… …
1577 } 1437 }
1578 1438
1579 /* this should not happen, but sometimes does */ 1439 /* this should not happen, but sometimes does */
1580 if (arrow->nrof == 0) 1440 if (arrow->nrof == 0)
1581 { 1441 {
1442 LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1582 arrow->destroy (); 1443 arrow->destroy ();
1583 return 0; 1444 return 0;
1584 } 1445 }
1585 1446
1586 left = arrow; /* these are arrows left to the player */ 1447 left = arrow; /* these are arrows left to the player */
… …
1596 arrow->direction = dir; 1457 arrow->direction = dir;
1597 1458
1598 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 */
1599 arrow->stats.hp = arrow->stats.dam; 1460 arrow->stats.hp = arrow->stats.dam;
1600 arrow->stats.grace = arrow->attacktype; 1461 arrow->stats.grace = arrow->attacktype;
1601 1462 arrow->custom_name = arrow->slaying;
1602 if (arrow->slaying)
1603 arrow->spellarg = strdup (arrow->slaying);
1604 1463
1605#if 0 1464#if 0
1606 if (player *pl = op->contr) 1465 if (player *pl = op->contr)
1607 { 1466 {
1608 float speed = pl->weapon_sp; 1467 float speed = pl->weapon_sp;
… …
1670 * but monsters can't. Putting that code here 1529 * but monsters can't. Putting that code here
1671 * makes the fire_bow code much cleaner. 1530 * makes the fire_bow code much cleaner.
1672 * this function should only be called if 'op' is a player, 1531 * this function should only be called if 'op' is a player,
1673 * hence the function name. 1532 * hence the function name.
1674 */ 1533 */
1675int 1534static int
1676player_fire_bow (object *op, int dir) 1535player_fire_bow (object *op, int dir)
1677{ 1536{
1678 int ret = 0, wcmod = 0; 1537 int ret;
1679 1538
1680 if (op->contr->bowtype == bow_bestarrow) 1539 if (op->contr->bowtype == bow_bestarrow)
1681 { 1540 {
1682 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);
1683 } 1542 }
1684 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)
1685 { 1544 {
1686 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1545 int wcmod = similar_direction (dir, op->contr->bowtype - bow_n + 1) ? 0 : -1;
1687 wcmod = -1;
1688
1689 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);
1690 } 1547 }
1691 else if (op->contr->bowtype == bow_threewide) 1548 else if (op->contr->bowtype == bow_threewide)
1692 { 1549 {
1693 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);
1694 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)]);
1695 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)]);
1696 } 1553 }
1697 else if (op->contr->bowtype == bow_spreadshot) 1554 else if (op->contr->bowtype == bow_spreadshot)
1698 { 1555 {
1699 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);
1700 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);
1701 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);
1702 } 1559 }
1703 else 1560 else
1704 { 1561 {
… …
1710} 1567}
1711 1568
1712/* Fires a misc (wand/rod/horn) object in 'dir'. 1569/* Fires a misc (wand/rod/horn) object in 'dir'.
1713 * Broken apart from 'fire' to keep it more readable. 1570 * Broken apart from 'fire' to keep it more readable.
1714 */ 1571 */
1715void 1572static void
1716fire_misc_object (object *op, int dir) 1573fire_misc_object (object *op, int dir)
1717{ 1574{
1718 object *item = op->contr->ranged_ob; 1575 object *item = op->contr->ranged_ob;
1719 1576
1720 if (!item) 1577 if (!item)
… …
1742 return; 1599 return;
1743 } 1600 }
1744 } 1601 }
1745 else if (item->type == ROD || item->type == HORN) 1602 else if (item->type == ROD || item->type == HORN)
1746 { 1603 {
1747 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);
1748 1605
1749 // 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
1750 // for a rod or horn, this fixes some broken rods. 1607 // for a rod or horn, this fixes some broken rods.
1751 if (item->stats.hp < MIN (spell_sp, item->stats.maxhp)) 1608 if (item->stats.hp < min (spell_sp, item->stats.maxhp))
1752 { 1609 {
1753 op->contr->play_sound (sound_find ("wand_poof")); 1610 op->contr->play_sound (sound_find ("wand_poof"));
1754 1611
1755 if (item->type == ROD) 1612 if (item->type == ROD)
1756 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));
… …
1761 } 1618 }
1762 } 1619 }
1763 1620
1764 if (cast_spell (op, item, dir, item->inv, NULL)) 1621 if (cast_spell (op, item, dir, item->inv, NULL))
1765 { 1622 {
1766 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
1767 if (item->type == WAND) 1625 if (item->type == WAND)
1768 { 1626 {
1769 if (!(--item->stats.food)) 1627 if (!(--item->stats.food))
1770 { 1628 {
1771 object *tmp; 1629 object *tmp;
… …
1791bool 1649bool
1792fire (object *op, int dir) 1650fire (object *op, int dir)
1793{ 1651{
1794 int spellcost = 0; 1652 int spellcost = 0;
1795 1653
1796 /* check for loss of invisiblity/hide */
1797 if (action_makes_visible (op))
1798 make_visible (op);
1799
1800 player *pl = op->contr; 1654 player *pl = op->contr;
1801 1655
1802 if (pl->golem) 1656 if (pl->golem)
1803 { 1657 {
1804 control_golem (op->contr->golem, dir); 1658 control_golem (op->contr->golem, dir);
… …
1806 } 1660 }
1807 1661
1808 object *ob = pl->ranged_ob; 1662 object *ob = pl->ranged_ob;
1809 1663
1810 if (!ob) 1664 if (!ob)
1811 return false;
1812
1813 if (!op->change_weapon (ob))
1814 return false; 1665 return false;
1815 1666
1816 if (op->speed_left > 0.f) 1667 if (op->speed_left > 0.f)
1817 --op->speed_left; 1668 --op->speed_left;
1818 else 1669 else
1819 return false; 1670 return false;
1820 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
1821 switch (ob->type) 1679 switch (ob->type)
1822 { 1680 {
1823 case BOW: 1681 case BOW:
1824 player_fire_bow (op, dir); 1682 player_fire_bow (op, dir);
1825 break; 1683 break;
1826 1684
1827 case SPELL: 1685 case SPELL:
1828 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);
1829 break; 1687 break;
1830 1688
1831 case BUILDER: 1689 case BUILDER:
1832 apply_map_builder (op, dir); 1690 apply_map_builder (op, dir);
1833 break; 1691 break;
… …
1842 } 1700 }
1843 1701
1844 return true; 1702 return true;
1845} 1703}
1846 1704
1847/* find_key 1705static object *
1848 * We try to find a key for the door as passed. If we find a key
1849 * and successfully use it, we return the key, otherwise NULL
1850 * This function merges both normal and locked door, since the logic
1851 * for both is the same - just the specific key is different.
1852 * pl is the player,
1853 * inv is the objects inventory to searched
1854 * door is the door we are trying to match against.
1855 * This function can be called recursively to search containers.
1856 */
1857object *
1858find_key (object *pl, object *container, object *door) 1706find_key_ (object *pl, object *container, object *door)
1859{ 1707{
1860 object *tmp, *key; 1708 object *tmp, *key;
1861 1709
1862 /* Should not happen, but sanity checking is never bad */ 1710 /* Should not happen, but sanity checking is never bad */
1863 if (!container->inv) 1711 if (!container->inv)
… …
1866 /* 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 */
1867 for (tmp = container->inv; tmp; tmp = tmp->below) 1715 for (tmp = container->inv; tmp; tmp = tmp->below)
1868 { 1716 {
1869 if (door->type == DOOR && tmp->type == KEY) 1717 if (door->type == DOOR && tmp->type == KEY)
1870 break; 1718 break;
1719
1871 /* For sanity, we should really check door type, but other stuff 1720 /* For sanity, we should really check door type, but other stuff
1872 * (like containers) can be locked with special keys 1721 * (like containers) can be locked with special keys
1873 */ 1722 */
1874 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1723 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1875 break; 1724 break;
… …
1881 * a key, return 1730 * a key, return
1882 */ 1731 */
1883 if (!tmp) 1732 if (!tmp)
1884 { 1733 {
1885 for (tmp = container->inv; tmp; tmp = tmp->below) 1734 for (tmp = container->inv; tmp; tmp = tmp->below)
1886 {
1887 /* No reason to search empty containers */ 1735 /* No reason to search empty containers */
1888 if (tmp->type == CONTAINER && tmp->inv) 1736 if (tmp->type == CONTAINER && tmp->inv)
1889 {
1890 if ((key = find_key (pl, tmp, door))) 1737 if ((key = find_key_ (pl, tmp, door)))
1891 return key; 1738 return key;
1892 }
1893 }
1894 1739
1895 if (!tmp) 1740 if (!tmp)
1896 return NULL; 1741 return 0;
1897 } 1742 }
1898 1743
1899 /* 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,
1900 * see if we actually want to use it 1745 * see if we actually want to use it
1901 */ 1746 */
1902 if (pl != container) 1747 if (pl != container)
1903 { 1748 {
1904 /* Only let players use keys in containers */ 1749 /* Only let players use keys in containers */
1905 if (!pl->contr) 1750 if (!pl->contr)
1906 return NULL; 1751 return 0;
1752
1907 /* cases where this fails: 1753 /* cases where this fails:
1908 * If we only search the player inventory, return now since we 1754 * If we only search the player inventory, return now since we
1909 * are not in the players inventory. 1755 * are not in the players inventory.
1910 * If the container is not active, return now since only active 1756 * If the container is not active, return now since only active
1911 * containers can be used. 1757 * containers can be used.
… …
1915 * inv must have been an container and must have been active. 1761 * inv must have been an container and must have been active.
1916 * 1762 *
1917 * Change the color so that the message doesn't disappear with 1763 * Change the color so that the message doesn't disappear with
1918 * all the others. 1764 * all the others.
1919 */ 1765 */
1920 if (pl->contr->usekeys == key_inventory || 1766 if (pl->contr->usekeys == key_inventory
1921 !QUERY_FLAG (container, FLAG_APPLIED) || 1767 || !QUERY_FLAG (container, FLAG_APPLIED)
1922 (pl->contr->usekeys == keyrings && (!container->race || strcmp (container->race, "keys")))) 1768 || (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1923 { 1769 {
1924 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1770 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1925 "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));
1926 return NULL; 1772 return NULL;
1927 } 1773 }
1928 } 1774 }
1929 1775
1930 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);
1931} 1802}
1932 1803
1933/* moved door processing out of move_player_attack. 1804/* moved door processing out of move_player_attack.
1934 * returns 1 if player has opened the door with a key 1805 * returns 1 if player has opened the door with a key
1935 * such that the caller should not do anything more, 1806 * such that the caller should not do anything more,
… …
1985 * going to try and move (not fire weapons). 1856 * going to try and move (not fire weapons).
1986 */ 1857 */
1987bool 1858bool
1988move_player_attack (object *op, int dir) 1859move_player_attack (object *op, int dir)
1989{ 1860{
1990 int on_battleground; 1861 if (!op->contr->braced && op->speed_left > 0.f && op->move (dir))
1862 {
1863 --op->speed_left;
1864 return true;
1865 }
1991 1866
1992 sint16 nx = freearr_x[dir] + op->x; 1867 sint16 nx = freearr_x[dir] + op->x;
1993 sint16 ny = freearr_y[dir] + op->y; 1868 sint16 ny = freearr_y[dir] + op->y;
1994 1869
1995 on_battleground = op_on_battleground (op, 0, 0);
1996
1997 if (out_of_map (op->map, nx, ny)) 1870 if (out_of_map (op->map, nx, ny))
1998 return false; 1871 return false;
1999
2000 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2001 {
2002 --op->speed_left;
2003 return true;
2004 }
2005 1872
2006 /* If braced, or can't move to the square, and it is not out of the 1873 /* If braced, or can't move to the square, and it is not out of the
2007 * map, attack it. Note order of if statement is important - don't 1874 * map, attack it. Note order of if statement is important - don't
2008 * want to be calling move_ob if braced, because move_ob will move the 1875 * want to be calling move_ob if braced, because move_ob will move the
2009 * player. This is a pretty nasty hack, because if we could 1876 * player. This is a pretty nasty hack, because if we could
… …
2069 --op->speed_left; 1936 --op->speed_left;
2070 1937
2071 op->play_sound (sound_find ("push_player")); 1938 op->play_sound (sound_find ("push_player"));
2072 push_ob (mon, dir, op); 1939 push_ob (mon, dir, op);
2073 1940
2074 if (op->contr->tmp_invis || op->hide) 1941 if (action_makes_visible (op))
2075 make_visible (op); 1942 make_visible (op);
2076 1943
2077 return true; 1944 return true;
2078 } 1945 }
2079 else 1946 else
2080 return false; 1947 return false;
2081 } 1948 }
1949
1950 bool on_battleground = op_on_battleground (op, 0, 0);
2082 1951
2083 /* in certain circumstances, you shouldn't attack friendly 1952 /* in certain circumstances, you shouldn't attack friendly
2084 * creatures. Note that if you are braced, you can't push 1953 * creatures. Note that if you are braced, you can't push
2085 * someone, but put it inside this loop so that you won't 1954 * someone, but put it inside this loop so that you won't
2086 * attack them either. 1955 * attack them either.
… …
2101 push_ob (mon, dir, op); 1970 push_ob (mon, dir, op);
2102 } 1971 }
2103 else 1972 else
2104 op->statusmsg ("You withhold your attack"); 1973 op->statusmsg ("You withhold your attack");
2105 1974
2106 if (op->contr->tmp_invis || op->hide) 1975 if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2107 make_visible (op); 1976 make_visible (op);
2108 1977
2109 return true; 1978 return true;
2110 } 1979 }
2111 } 1980 }
… …
2151} 2020}
2152 2021
2153bool 2022bool
2154move_player (object *op, int dir) 2023move_player (object *op, int dir)
2155{ 2024{
2156 int pick;
2157
2158 if (!op->map || op->map->in_memory != MAP_ACTIVE) 2025 if (!op->map || op->map->in_memory != MAP_ACTIVE)
2159 return 0; 2026 return 0;
2160 2027
2161 /* Sanity check: make sure dir is valid */ 2028 /* Sanity check: make sure dir is valid */
2162 if ((dir < 0) || (dir >= 9)) 2029 if (dir < 0 || dir >= 9)
2163 { 2030 {
2164 LOG (llevError, "move_player: invalid direction %d\n", dir); 2031 LOG (llevError, "move_player: invalid direction %d\n", dir);
2165 return 0; 2032 return 0;
2166 } 2033 }
2167 2034
… …
2169 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2036 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2170 dir = absdir (dir + rndm (3) + rndm (3) - 2); 2037 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2171 2038
2172 op->facing = dir; 2039 op->facing = dir;
2173 2040
2174 if (op->hide) 2041 if (op->flag [FLAG_HIDDEN])
2175 do_hidden_move (op); 2042 do_hidden_move (op);
2176 2043
2177 bool retval; 2044 bool retval;
2045 int pick = 0;
2178 2046
2179 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2047 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2180 retval = RESULT_INT (0); 2048 retval = RESULT_INT (0);
2181 else if (op->contr->fire_on) 2049 else if (op->contr->fire_on)
2182 retval = fire (op, dir); 2050 retval = fire (op, dir);
… …
2239 return move_player (op, op->direction); 2107 return move_player (op, op->direction);
2240 2108
2241 return false; 2109 return false;
2242} 2110}
2243 2111
2244int 2112static int
2245save_life (object *op) 2113save_life (object *op)
2246{ 2114{
2247 if (!QUERY_FLAG (op, FLAG_LIFESAVE)) 2115 if (!QUERY_FLAG (op, FLAG_LIFESAVE))
2248 return 0; 2116 return 0;
2249 2117
… …
2296void 2164void
2297object::drop_unpaid_items () 2165object::drop_unpaid_items ()
2298{ 2166{
2299 if (!flag [FLAG_REMOVED]) 2167 if (!flag [FLAG_REMOVED])
2300 ::drop_unpaid_items (inv, this); 2168 ::drop_unpaid_items (inv, this);
2301}
2302
2303/*
2304 * Returns pointer a static string containing gravestone text
2305 * Moved from apply.c to player.c - player.c is what
2306 * actually uses this function. player.c may not be quite the
2307 * best, a misc file for object actions is probably better,
2308 * but there isn't one in the server directory.
2309 */
2310const char *
2311gravestone_text (object *op)
2312{
2313 static dynbuf_text buf;
2314
2315 buf << "---- R.I.P. ----\n\n";
2316 op->name;
2317
2318 if (op->type == PLAYER)
2319 buf << " the " << op->contr->title;
2320
2321 buf << "\n\n";
2322
2323 buf << "who was level ";
2324 buf << (sint32)op->level << "\n\n" // OO breakdown
2325 << " when " << (op->contr ? "killed" : "died") << "\n\n";
2326
2327 if (op->type == PLAYER)
2328 buf << "by " << op->contr->killer_name () << ".\n\n";
2329
2330 {
2331 static char buf2[128];
2332 time_t now = time (NULL);
2333 strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2334 buf << buf2;
2335 }
2336
2337 return buf;
2338} 2169}
2339 2170
2340void 2171void
2341do_some_living (object *op) 2172do_some_living (object *op)
2342{ 2173{
… …
2497 { 2328 {
2498 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp; 2329 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2499 2330
2500 if (over_hp > 0) 2331 if (over_hp > 0)
2501 { 2332 {
2502 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2333 op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2503 op->last_heal = 0; 2334 op->last_heal = 0;
2504 } 2335 }
2505 else 2336 else
2506 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2337 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2507 } 2338 }
… …
2563 2394
2564 if (op->stats.food < 0) 2395 if (op->stats.food < 0)
2565 { 2396 {
2566 op->stats.hp += op->stats.food; 2397 op->stats.hp += op->stats.food;
2567 op->stats.food = 0; 2398 op->stats.food = 0;
2399
2400 if (op->stats.hp < 0)
2401 {
2402 op->contr->killer = archetype::get ("killer_starvation");
2403 op->contr->killer->destroy ();
2568 } 2404 }
2405 }
2569 2406
2407 /* killer should be set here already */
2570 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2408 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2571 kill_player (op); 2409 kill_player (op);
2572 } 2410 }
2573} 2411}
2574 2412
… …
2579 */ 2417 */
2580void 2418void
2581kill_player (object *op) 2419kill_player (object *op)
2582{ 2420{
2583 int x, y; 2421 int x, y;
2584 char buf[MAX_BUF];
2585 maptile *map; /* this is for resurrection */ 2422 maptile *map; /* this is for resurrection */
2586 int will_kill_again; 2423 int will_kill_again;
2587 archetype *at; 2424 archetype *at;
2588 object *tmp; 2425 object *tmp;
2589 2426
2590 if (save_life (op)) 2427 if (save_life (op))
2591 return; 2428 return;
2429
2430 dynbuf_text deathtab;
2431
2432 /* restore player */
2433 at = archetype::find (shstr_poisoning);
2434 if (object *tmp = present_arch_in_ob (at, op))
2435 {
2436 tmp->destroy ();
2437 deathtab << "Your body feels cleansed...\r";
2438 }
2439
2440 at = archetype::find (shstr_confusion);
2441 if (object *tmp = present_arch_in_ob (at, op))
2442 {
2443 tmp->destroy ();
2444 deathtab << "Your mind feels clearer...\r";
2445 }
2446
2447 cure_disease (op, 0, 0); /* remove any disease */
2448
2449 max_it (op->stats.hp , op->stats.maxhp);
2450 max_it (op->stats.sp , op->stats.maxsp);
2451 max_it (op->stats.grace, op->stats.maxgrace);
2452
2453 if (op->stats.food <= 0)
2454 op->stats.food = 999;
2455
2456 // remove all spell effects that are active
2457 // to avoid long-term effects such as word-of-recall
2458 for (object *item = op->inv; item; )
2459 {
2460 object *next = item->below;
2461
2462 if (item->type == SPELL_EFFECT && item->active)
2463 item->destroy ();
2464
2465 item = next;
2466 }
2592 2467
2593 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2468 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2594 * in cities ONLY!!! It is very important that this doesn't get abused. 2469 * in cities ONLY!!! It is very important that this doesn't get abused.
2595 * Look at op_on_battleground() for more info --AndreasV 2470 * Look at op_on_battleground() for more info --AndreasV
2596 */ 2471 */
2597 if (op_on_battleground (op, &x, &y)) 2472 if (op_on_battleground (op, &x, &y))
2598 { 2473 {
2599 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); 2474 deathtab << "You almost died in combat, but local medics have saved your life...\r";
2600 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2601
2602 /* restore player */
2603 at = archetype::find ("poisoning");
2604 if (object *tmp = present_arch_in_ob (at, op))
2605 {
2606 tmp->destroy ();
2607 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2608 }
2609
2610 at = archetype::find ("confusion");
2611 if (object *tmp = present_arch_in_ob (at, op))
2612 {
2613 tmp->destroy ();
2614 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2615 }
2616
2617 cure_disease (op, 0, 0); /* remove any disease */
2618 op->stats.hp = op->stats.maxhp;
2619 if (op->stats.food <= 0)
2620 op->stats.food = 999;
2621 2475
2622 /* create a bodypart-trophy to make the winner happy */ 2476 /* create a bodypart-trophy to make the winner happy */
2623 if (object *tmp = arch_to_object (archetype::find ("finger"))) 2477 object *tmp = archetype::find (shstr_finger)->instance ();
2624 { 2478
2625 tmp->name = format ("%s's finger" , &op->name); 2479 tmp->name = format ("%s's finger" , &op->name);
2626 tmp->name_pl = format ("%s's fingers", &op->name); 2480 tmp->name_pl = format ("%s's fingers", &op->name);
2627 tmp->msg = format ( 2481 tmp->msg = format (
2628 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n", 2482 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2629 &op->name, op->contr->title, 2483 &op->name, op->contr->title,
2630 (int)op->level, 2484 (int)op->level,
2631 op->contr->killer_name () 2485 op->contr->killer_name ()
2632 ); 2486 );
2633 tmp->value = 0, tmp->type = 0; 2487 tmp->value = 0, tmp->type = 0;
2634 tmp->materialname = "organics"; 2488 tmp->material = name_to_material (shstr_organic);
2635 tmp->insert_at (op, tmp); 2489 tmp->insert_at (op, tmp);
2636 }
2637 2490
2638 /* teleport defeated player to new destination */ 2491 /* teleport defeated player to new destination */
2639 transfer_ob (op, x, y, 0, NULL); 2492 transfer_ob (op, x, y, 0, NULL);
2640 op->contr->braced = 0; 2493 op->contr->braced = 0;
2494
2495 op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2641 return; 2496 return;
2642 } 2497 }
2643 2498
2499 deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n";
2500 deathtab << "T<YOU HAVE DIED>\n\n";
2501
2644 INVOKE_PLAYER (DEATH, op->contr); 2502 INVOKE_PLAYER (DEATH, op->contr);
2645 2503
2646 command_kill_pets (op, 0); 2504 command_kill_pets (op, 0);
2647
2648 if (op->stats.food < 0)
2649 {
2650 op->contr->killer = archetype::get ("killer_starvation");
2651 op->contr->killer->destroy ();
2652 }
2653 2505
2654 op->contr->play_sound (sound_find ("player_dies")); 2506 op->contr->play_sound (sound_find ("player_dies"));
2655 2507
2656 /* save the map location for corpse, gravestone */ 2508 /* save the map location for corpse, gravestone */
2657 x = op->x; 2509 x = op->x;
… …
2687 2539
2688 lost_a_stat = 0; 2540 lost_a_stat = 0;
2689 2541
2690 for (z = 0; z < num_stats_lose; z++) 2542 for (z = 0; z < num_stats_lose; z++)
2691 { 2543 {
2692 i = RANDOM () % NUM_STATS; 2544 i = rndm (NUM_STATS);
2693 2545
2694 if (settings.stat_loss_on_death) 2546 if (settings.stat_loss_on_death)
2695 { 2547 {
2696 /* Pick a random stat and take a point off it. Tell the player 2548 /* Pick a random stat and take a point off it. Tell the player
2697 * what he lost. 2549 * what he lost.
… …
2704 lost_a_stat = 1; 2556 lost_a_stat = 1;
2705 } 2557 }
2706 else 2558 else
2707 { 2559 {
2708 /* deplete a stat */ 2560 /* deplete a stat */
2709 archetype *deparch = archetype::find ("depletion"); 2561 archetype *deparch = archetype::find (shstr_depletion);
2710 object *dep; 2562 object *dep;
2711 2563
2712 dep = present_arch_in_ob (deparch, op); 2564 dep = present_arch_in_ob (deparch, op);
2713 if (!dep) 2565 if (!dep)
2714 { 2566 {
2715 dep = arch_to_object (deparch); 2567 dep = deparch->instance ();
2716 insert_ob_in_ob (dep, op); 2568 insert_ob_in_ob (dep, op);
2717 } 2569 }
2718 lose_this_stat = 1; 2570 lose_this_stat = 1;
2719 if (settings.balanced_stat_loss) 2571 if (settings.balanced_stat_loss)
2720 { 2572 {
… …
2748 } 2600 }
2749 } 2601 }
2750 2602
2751 if (lose_this_stat) 2603 if (lose_this_stat)
2752 { 2604 {
2753 this_stat = get_attr_value (&(dep->stats), i); 2605 this_stat = get_attr_value (&dep->stats, i);
2754 /* We could try to do something clever like find another 2606 /* We could try to do something clever like find another
2755 * stat to reduce if this fails. But chances are, if 2607 * stat to reduce if this fails. But chances are, if
2756 * stats have been depleted to -50, all are pretty low 2608 * stats have been depleted to -50, all are pretty low
2757 * and should be roughly the same, so it shouldn't make a 2609 * and should be roughly the same, so it shouldn't make a
2758 * difference. 2610 * difference.
… …
2772 /* If no stat lost, tell the player. */ 2624 /* If no stat lost, tell the player. */
2773 if (!lost_a_stat) 2625 if (!lost_a_stat)
2774 { 2626 {
2775 /* determine_god() seems to not work sometimes... why is this? 2627 /* determine_god() seems to not work sometimes... why is this?
2776 Should I be using something else? GD */ 2628 Should I be using something else? GD */
2777 const char *god = determine_god (op); 2629 shstr_tmp god = determine_god (op);
2778 2630
2779 if (god && (strcmp (god, "none"))) 2631 if (god != shstr_none)
2780 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god); 2632 deathtab << "For a brief moment you feel the holy presence of " << god << " protecting you.\r";
2781 else 2633 else
2782 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you."); 2634 deathtab << "For a brief moment you feel a holy presence protecting you.\r";
2783 } 2635 }
2784#else 2636#else
2785 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely."); 2637 deathtab << "For a brief moment you feel a holy presence protecting you from losing yourself completely.";
2786#endif 2638#endif
2787 2639
2788 /* Put a gravestone up where the character 'almost' died. List the 2640 /* Put a gravestone up where the character 'almost' died. List the
2789 * exp loss on the stone. 2641 * exp loss on the stone.
2790 */ 2642 */
2791 tmp = arch_to_object (archetype::find ("gravestone")); 2643 tmp = archetype::find (shstr_gravestone)->instance ();
2792 tmp->name = format ("%s's gravestone", &op->name); 2644 tmp->name = format ("%s's gravestone", &op->name);
2793 tmp->name_pl = format ("%s's gravestones", &op->name); 2645 tmp->name_pl = format ("%s's gravestones", &op->name);
2794 tmp->msg = format ("RIP\nHere rests the hero %s the %s,\nwho was killed\nby %s.\n", &op->name, op->contr->title, op->contr->killer_name ()); 2646 tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2647 &op->name, op->contr->title, op->contr->killer_name ());
2795 tmp->x = op->x, tmp->y = op->y; 2648 tmp->x = op->x, tmp->y = op->y;
2796 insert_ob_in_map (tmp, op->map, NULL, 0); 2649 insert_ob_in_map (tmp, op->map, NULL, 0);
2797 2650
2798 /**************************************/ 2651 /**************************************/
2799 /* */ 2652 /* */
2800 /* Subtract the experience points, */ 2653 /* Subtract the experience points, */
2801 /* if we died cause of food, give us */
2802 /* food, and reset HP's... */
2803 /* */ 2654 /* */
2804 /**************************************/ 2655 /**************************************/
2805 2656
2806 /* remove any poisoning and confusion the character may be suffering. */
2807 /* restore player */
2808 at = archetype::find ("poisoning");
2809 tmp = present_arch_in_ob (at, op);
2810
2811 if (tmp)
2812 {
2813 tmp->destroy ();
2814 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2815 }
2816
2817 at = archetype::find ("confusion");
2818 tmp = present_arch_in_ob (at, op);
2819 if (tmp)
2820 {
2821 tmp->destroy ();
2822 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2823 }
2824
2825 cure_disease (op, 0, 0); /* remove any disease */
2826
2827 // remove all spell effects that are active
2828 // to avoid long-term effects such as word-of-recall
2829 for (object *item = op->inv; item; )
2830 {
2831 object *next = item->below;
2832
2833 if (item->type == SPELL_EFFECT && item->active)
2834 item->destroy ();
2835
2836 item = next;
2837 }
2838
2839 /*add_exp(op, (op->stats.exp * -0.20)); */ 2657 /*add_exp(op, (op->stats.exp * -0.20)); */
2840 apply_death_exp_penalty (op); 2658 apply_death_exp_penalty (op);
2841
2842 if (op->stats.food < 100)
2843 op->stats.food = 900;
2844
2845 op->stats.hp = op->stats.maxhp;
2846 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2847 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2848 2659
2849 /* 2660 /*
2850 * Check to see if the player has any unpaid items. If so, remove them 2661 * Check to see if the player has any unpaid items. If so, remove them
2851 * and put them back in the map. 2662 * and put them back in the map.
2852 */ 2663 */
… …
2887 if (will_kill_again & (1 << at)) 2698 if (will_kill_again & (1 << at))
2888 force->resist[at] = 100; 2699 force->resist[at] = 100;
2889 2700
2890 insert_ob_in_ob (force, op); 2701 insert_ob_in_ob (force, op);
2891 op->update_stats (); 2702 op->update_stats ();
2892
2893 } 2703 }
2894 2704
2895 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED."); 2705 op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2896} 2706}
2897 2707
2898void 2708static void
2899loot_object (object *op) 2709loot_object (object *op)
2900{ /* Grab and destroy some treasure */ 2710{ /* Grab and destroy some treasure */
2901 object *tmp, *tmp2, *next; 2711 object *tmp, *tmp2, *next;
2902 2712
2903 op->close_container (); /* close open sack first */ 2713 op->close_container (); /* close open sack first */
… …
2934 * fix_weight(): Check recursively the weight of all players, and fix 2744 * fix_weight(): Check recursively the weight of all players, and fix
2935 * what needs to be fixed. Refresh windows and fix speed if anything 2745 * what needs to be fixed. Refresh windows and fix speed if anything
2936 * was changed. 2746 * was changed.
2937 */ 2747 */
2938void 2748void
2939fix_weight (void) 2749fix_weight ()
2940{ 2750{
2941 for_all_players (pl) 2751 for_all_players (pl)
2942 { 2752 {
2943 sint32 old = pl->ob->carrying; 2753 sint32 old = pl->ob->carrying;
2944 2754
… …
2951 } 2761 }
2952 } 2762 }
2953} 2763}
2954 2764
2955void 2765void
2956fix_luck (void) 2766fix_luck ()
2957{ 2767{
2958 for_all_players (pl) 2768 for_all_players (pl)
2959 if (!pl->ob->contr->ns->state) 2769 if (!pl->ob->contr->ns->state)
2960 pl->ob->change_luck (0); 2770 pl->ob->change_luck (0);
2961} 2771}
… …
2998} 2808}
2999 2809
3000void 2810void
3001make_visible (object *op) 2811make_visible (object *op)
3002{ 2812{
3003 op->hide = 0; 2813 op->flag [FLAG_HIDDEN] = 0;
3004 op->invisible = 0; 2814 op->invisible = 0;
3005 2815
3006 if (op->type == PLAYER) 2816 if (op->type == PLAYER)
3007 { 2817 {
3008 op->contr->tmp_invis = 0; 2818 op->contr->tmp_invis = 0;
… …
3033 2843
3034 if (!ob || !ob->map) 2844 if (!ob || !ob->map)
3035 return 0; 2845 return 0;
3036 2846
3037 /* so, on normal lighted maps, its hard to hide */ 2847 /* so, on normal lighted maps, its hard to hide */
3038 level = ob->map->darkness - 2; 2848 level = ob->map->darklevel () - 2;
3039 2849
3040 /* this also picks up whether the object is glowing. 2850 /* this also picks up whether the object is glowing.
3041 * If you carry a light on a non-dark map, its not 2851 * If you carry a light on a non-dark map, its not
3042 * as bad as carrying a light on a pitch dark map */ 2852 * as bad as carrying a light on a pitch dark map */
3043 if (has_carried_lights (ob)) 2853 if (ob->has_carried_lights ())
3044 level = -(10 + (2 * ob->map->darkness)); 2854 level = -(10 + (2 * ob->map->darklevel ()));
3045 2855
3046 /* scan through all nearby squares for terrain to hide in */ 2856 /* scan through all nearby squares for terrain to hide in */
3047 for (i = 0, x = ob->x, y = ob->y; 2857 for (i = 0, x = ob->x, y = ob->y;
3048 i <= SIZEOFFREE1; 2858 i <= SIZEOFFREE1;
3049 i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i]) 2859 i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
… …
3196 while (op) 3006 while (op)
3197 { 3007 {
3198 dx = rv.distance_x + op->arch->x; 3008 dx = rv.distance_x + op->arch->x;
3199 dy = rv.distance_y + op->arch->y; 3009 dy = rv.distance_y + op->arch->y;
3200 3010
3201 /* only the viewable area the player sees is updated by LOS 3011 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; 3012 return 1;
3209 3013
3210 op = op->more; 3014 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 } 3015 }
3240 3016
3241 return 0; 3017 return 0;
3242} 3018}
3243 3019
… …
3267 && tmp->name == shstr_battleground 3043 && tmp->name == shstr_battleground
3268 && EXIT_X (tmp) && EXIT_Y (tmp)) 3044 && EXIT_X (tmp) && EXIT_Y (tmp))
3269 { 3045 {
3270 /* before we assign the exit, check if this is a teambattle */ 3046 /* before we assign the exit, check if this is a teambattle */
3271 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3047 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3272 {
3273 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below) 3048 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3049 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3274 { 3050 {
3275 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3276 {
3277 if (x && y) 3051 if (x && y)
3278 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3052 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3279 3053
3280 return 1; 3054 return 1;
3281 }
3282 } 3055 }
3283 }
3284 3056
3285 if (x && y) 3057 if (x && y)
3286 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3058 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3287 3059
3288 return 1; 3060 return 1;
… …
3445 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg); 3217 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3446 } 3218 }
3447 else 3219 else
3448 { 3220 {
3449 /* generate misc. treasure */ 3221 /* generate misc. treasure */
3450 tmp = arch_to_object (tr->item); 3222 tmp = tr->item->instance ();
3451 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp)); 3223 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3452 who->insert (tmp); 3224 who->insert (tmp);
3453 } 3225 }
3454} 3226}
3455 3227
… …
3468 3240
3469 if (pl->ranged_ob == ob) 3241 if (pl->ranged_ob == ob)
3470 pl->ranged_ob = 0; 3242 pl->ranged_ob = 0;
3471} 3243}
3472 3244
3245//-GPL
3246
3473sint8 3247sint8
3474player::visibility_at (maptile *map, int x, int y) const 3248player::darkness_at (maptile *map, int x, int y) const
3475{ 3249{
3476 if (!ns) 3250 if (!ns)
3477 return 0; 3251 return LOS_BLOCKED;
3478 3252
3479 int dx, dy; 3253 int dx, dy;
3480 if (!adjacent_map (map, ns->current_map, &dx, &dy)) 3254 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3481 return 0; 3255 return LOS_BLOCKED;
3482 3256
3483 x += dx - ns->current_x + ns->mapx / 2; 3257 x += dx - ns->current_x;
3484 y += dy - ns->current_y + ns->mapy / 2; 3258 y += dy - ns->current_y;
3485 3259
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]; 3260 return blocked_los (x, y);
3490} 3261}
3491 3262
3492void 3263void
3493player::infobox (const char *title, const char *msg, int color) 3264player::infobox (const char *title, const char *msg, int color)
3494{ 3265{

Diff Legend

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