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.72 by root, Wed Dec 27 15:04:39 2006 UTC vs.
Revision 1.144 by root, Sat May 26 15:44:08 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <pwd.h>
26#include <sproto.h> 26#include <sproto.h>
27#include <sounds.h> 27#include <sounds.h>
28#include <living.h> 28#include <living.h>
29#include <object.h> 29#include <object.h>
30#include <spells.h> 30#include <spells.h>
31#include <skills.h> 31#include <skills.h>
32 32
33#include <algorithm> 33#include <algorithm>
34#include <functional> 34#include <functional>
35 35
36player * 36playervec players;
37find_player (const char *plname)
38{
39 for_all_players (pl)
40 if (pl->ob && !strcmp (query_name (pl->ob), plname))
41 return pl;
42
43 return 0;
44}
45 37
46void 38void
47display_motd (const object *op) 39display_motd (const object *op)
48{ 40{
49 char buf[MAX_BUF]; 41 char buf[MAX_BUF];
… …
123 115
124 news[0] = '\0'; 116 news[0] = '\0';
125 subject[0] = '\0'; 117 subject[0] = '\0';
126 size = 0; 118 size = 0;
127 119
128 while (fgets (buf, MAX_BUF, fp) != NULL) 120 while (fgets (buf, MAX_BUF, fp))
129 { 121 {
130 if (*buf == '#') 122 if (*buf == '#')
131 continue; 123 continue;
132 124
133 if (*buf == '%') 125 if (*buf == '%')
134 { /* send one news */ 126 { /* send one news */
135 if (size > 0) 127 if (size > 0)
136 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", "%s\n%s", subject, news); /*send previously read news */ 128 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 */
129
137 strcpy (subject, buf + 1); 130 strcpy (subject, buf + 1);
138 strip_endline (subject); 131 strip_endline (subject);
139 size = 0; 132 size = 0;
140 news[0] = '\0'; 133 news[0] = '\0';
141 } 134 }
… …
150 size += strlen (buf); 143 size += strlen (buf);
151 } 144 }
152 } 145 }
153 146
154 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 147 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
155 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news); 148 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
156 close_and_delete (fp, comp); 149 close_and_delete (fp, comp);
157} 150}
158 151
159/* This loads the first map an puts the player on it. */ 152/* This loads the first map an puts the player on it. */
160static void 153static void
161set_first_map (object *op) 154set_first_map (object *op)
162{ 155{
163 strcpy (op->contr->maplevel, first_map_path); 156 op->contr->maplevel = first_map_path;
164 op->x = -1; 157 op->x = -1;
165 op->y = -1; 158 op->y = -1;
166 enter_exit (op, 0); 159}
160
161void
162player::activate ()
163{
164 if (active)
165 return;
166
167 players.insert (this);
168 ob->remove ();
169 ob->map = 0;
170 ob->activate_recursive ();
171 CLEAR_FLAG (ob, FLAG_FRIENDLY);
172 add_friendly_object (ob);
173}
174
175void
176player::deactivate ()
177{
178 if (!active)
179 return;
180
181 terminate_all_pets (ob);
182 remove_friendly_object (ob);
183 ob->deactivate_recursive ();
184
185 if (ob->map)
186 maplevel = ob->map->path;
187
188 ob->remove ();
189 ob->map = 0;
190 party = 0;
191
192 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
193
194 players.erase (this);
167} 195}
168 196
169// connect the player with a specific client 197// connect the player with a specific client
170// also changed, rationalises, and fixes some incorrect settings 198// also changes, rationalises, and fixes some incorrect settings
171void 199void
172player::connect (client *ns) 200player::connect (client *ns)
173{ 201{
174 this->ns = ns; 202 this->ns = ns;
175 ns->pl = this; 203 ns->pl = this;
176 204
177 next = first_player; 205 run_on = 0;
178 first_player = this; 206 fire_on = 0;
207 ob->close_container (); //TODO: client-specific
179 208
180 ns->update_look = 0; 209 ns->update_look = 0;
181 ns->look_position = 0; 210 ns->look_position = 0;
182 211
183 clear_los (ob); 212 clear_los (ob);
213
214 ns->reset_stats ();
184 215
185 /* make sure he's a player -- needed because of class change. */ 216 /* make sure he's a player -- needed because of class change. */
186 ob->type = PLAYER; // we are paranoid 217 ob->type = PLAYER; // we are paranoid
187 ob->race = ob->arch->clone.race; 218 ob->race = ob->arch->clone.race;
188 219
189 if (!legal_range (ob, shoottype))
190 shoottype = range_none;
191
192 ob->carrying = sum_weight (ob); 220 ob->carrying = sum_weight (ob);
193 link_player_skills (ob); 221 link_player_skills (ob);
194 222
195 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 223 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
196 ob->set_speed (ob->speed);
197 224
198 assign (title, ob->arch->clone.name); 225 assign (title, ob->arch->clone.name);
199
200 /* can_use_shield is a new flag. However, the can_use.. seems to largely come
201 * from the class, and not race. I don't see any way to get the class information
202 * to then update this. I don't think this will actually break anything - anyone
203 * that can use armour should be able to use a shield. What this may 'break'
204 * are features new characters get, eg, if someone starts up with a Q, they
205 * should be able to use a shield. However, old Q's won't get that advantage.
206 */
207 if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
208 SET_FLAG (ob, FLAG_USE_SHIELD);
209 226
210 /* if it's a dragon player, set the correct title here */ 227 /* if it's a dragon player, set the correct title here */
211 if (is_dragon_pl (ob)) 228 if (is_dragon_pl (ob))
212 { 229 {
213 object *tmp, *abil = 0, *skin = 0; 230 object *tmp, *abil = 0, *skin = 0;
… …
223 skin = tmp; 240 skin = tmp;
224 241
225 set_dragon_name (ob, abil, skin); 242 set_dragon_name (ob, abil, skin);
226 } 243 }
227 244
228 CLEAR_FLAG (ob, FLAG_FRIENDLY);
229 add_friendly_object (ob);
230
231 LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
232
233 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 245 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
234 246
235 esrv_new_player (this, ob->weight + ob->carrying); 247 esrv_new_player (this, ob->weight + ob->carrying);
236 248
249 ob->flag [FLAG_READY_WEAPON] = false;
250 ob->flag [FLAG_READY_SKILL] = false;
251 ob->flag [FLAG_READY_BOW] = false;
252
253 for (object *op = ob->inv; op; op = op->below)
254 if (op->flag [FLAG_APPLIED])
255 switch (op->type)
256 {
257 case SKILL:
258 ob->flag [FLAG_APPLIED] = false;
259 break;
260
261 case WAND:
262 case ROD:
263 case HORN:
264 case BOW:
265 ranged_ob = op;
266 break;
267
268 case WEAPON:
269 combat_ob = op;
270 break;
271 }
272
273 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
237 ob->update_stats (); 274 ob->update_stats ();
275
238 ns->floorbox_update (); 276 ns->floorbox_update ();
239
240 esrv_send_inventory (ob, ob); 277 esrv_send_inventory (ob, ob);
241 esrv_add_spells (this, 0); 278 esrv_add_spells (this, 0);
242 279
243 enter_exit (ob, 0); 280 activate ();
244 281
245 send_rules (ob); 282 send_rules (ob);
246 send_news (ob); 283 send_news (ob);
247 display_motd (ob); 284 display_motd (ob);
285
286 INVOKE_PLAYER (CONNECT, this);
248 INVOKE_PLAYER (LOGIN, this); 287 INVOKE_PLAYER (LOGIN, this);
249} 288}
250 289
251void 290void
252player::disconnect () 291player::disconnect ()
253{ 292{
254 //TODO: don't be so harsh and destroy :)
255 if (ns) 293 if (ns)
256 { 294 {
257 if (enable_save) 295 if (active)
258 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0)); 296 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
259 297
260 client *ns = this->ns; 298 INVOKE_PLAYER (DISCONNECT, this);
261 ns->send_packet ("goodbye"); 299
262 ns->flush (); 300 ns->reset_stats ();
263 ns->pl = 0; 301 ns->pl = 0;
264 this->ns = 0; 302 ns = 0;
265
266 ns->destroy ();
267 destroy ();
268 } 303 }
304
305 if (ob)
306 ob->close_container (); //TODO: client-specific
307
308 deactivate ();
269} 309}
270 310
271// the need for this function can be explained 311// the need for this function can be explained
272// by load_object not returning the object 312// by load_object not returning the object
273void 313void
274player::set_object (object *op) 314player::set_object (object *op)
275{ 315{
276 ob = op; 316 ob = op;
277 ob->contr = this; /* this aren't yet in archetype */ 317 ob->contr = this; /* this aren't yet in archetype */
278 318
319 ob->speed = 1.0f;
279 ob->speed_left = 0.5; 320 ob->speed_left = 0.5f;
280 ob->speed = 1.0; 321
281 ob->direction = 5; /* So player faces south */ 322 ob->direction = 5; /* So player faces south */
282 ob->stats.wc = 2;
283 ob->run_away = 25; /* Then we panick... */
284
285 set_first_map (ob);
286
287 ob->roll_stats ();
288} 323}
289 324
290player::player () 325player::player ()
291{ 326{
292 /* There are some elements we want initialized to non zero value - 327 /* There are some elements we want initialised to non zero value -
293 * we deal with that below this point. 328 * we deal with that below this point.
294 */ 329 */
295 outputs_sync = 16; /* Every 2 seconds */ 330 outputs_sync = 4;
296 outputs_count = 8; /* Keeps present behaviour */ 331 outputs_count = 4;
297 unapply = unapply_nochoice; 332 unapply = unapply_nochoice;
298 333
299 assign (savebed_map, first_map_path); /* Init. respawn position */ 334 savebed_map = first_map_path; /* Init. respawn position */
300 335
301 gen_sp_armour = 10; 336 gen_sp_armour = 10;
302 last_speed = -1;
303 shoottype = range_none;
304 bowtype = bow_normal; 337 bowtype = bow_normal;
305 petmode = pet_normal; 338 petmode = pet_normal;
306 listening = 10; 339 listening = 10;
307 usekeys = containers; 340 usekeys = containers;
308 last_weapon_sp = -1;
309 peaceful = 1; /* default peaceful */ 341 peaceful = 1; /* default peaceful */
310 do_los = 1; 342 do_los = 1;
311 343
312 /* we need to clear these to -1 and not zero - otherwise, 344 weapon_sp = 1.0f;
313 * if a player quits and starts a new character, we wont 345 weapon_sp_left = 0.5f;
314 * send new values to the client, as things like exp start
315 * at zero.
316 */
317 for (int i = 0; i < NUM_SKILLS; i++)
318 last_skill_exp[i] = -1;
319
320 for (int i = 0; i < NROFATTACKS; i++)
321 last_resist[i] = -1;
322
323 last_stats.exp = -1;
324 last_weight = (uint32) - 1;
325} 346}
326 347
327void 348void
328player::do_destroy () 349player::do_destroy ()
329{ 350{
330 disconnect (); 351 disconnect ();
331 352
332 save (false);
333 enable_save = false;
334
335 attachable::do_destroy (); 353 attachable::do_destroy ();
336
337 terminate_all_pets (ob);
338
339 if (first_player != this)
340 {
341 player *prev = first_player;
342
343 while (prev && prev->next && prev->next != this)
344 prev = prev->next;
345
346 if (prev->next != this)
347 {
348 LOG (llevError, "Free_player: Can't find previous player.\n");
349 abort ();
350 }
351
352 prev->next = next;
353 }
354 else
355 first_player = next;
356 354
357 if (ob) 355 if (ob)
358 { 356 {
359 ob->destroy_inv (false); 357 ob->destroy_inv (false);
360 ob->destroy (); 358 ob->destroy ();
… …
375player::create () 373player::create ()
376{ 374{
377 player *pl = new player; 375 player *pl = new player;
378 376
379 pl->set_object (arch_to_object (get_player_archetype (0))); 377 pl->set_object (arch_to_object (get_player_archetype (0)));
378
379 pl->ob->roll_stats ();
380 pl->ob->stats.wc = 2;
381 pl->ob->run_away = 25; /* Then we panick... */
382
383 set_first_map (pl->ob);
380 384
381 return pl; 385 return pl;
382} 386}
383 387
384/* 388/*
… …
415 object *op = NULL; 419 object *op = NULL;
416 objectlink *ol; 420 objectlink *ol;
417 unsigned lastdist; 421 unsigned lastdist;
418 rv_vector rv; 422 rv_vector rv;
419 423
420 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 424 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
421 { 425 {
422 /* We should not find free objects on this friendly list, but it 426 /* We should not find free objects on this friendly list, but it
423 * does periodically happen. Given that, lets deal with it. 427 * does periodically happen. Given that, lets deal with it.
424 * While unlikely, it is possible the next object on the friendly 428 * While unlikely, it is possible the next object on the friendly
425 * list is also free, so encapsulate this in a while loop. 429 * list is also free, so encapsulate this in a while loop.
… …
429 object *tmp = ol->ob; 433 object *tmp = ol->ob;
430 434
431 /* Can't do much more other than log the fact, because the object 435 /* Can't do much more other than log the fact, because the object
432 * itself will have been cleared. 436 * itself will have been cleared.
433 */ 437 */
434 LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n"); 438 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
439 tmp->debug_desc ());
435 ol = ol->next; 440 ol = ol->next;
436 remove_friendly_object (tmp); 441 remove_friendly_object (tmp);
437 if (!ol) 442 if (!ol)
438 return op; 443 return op;
439 } 444 }
… …
528 x = mon->x; 533 x = mon->x;
529 y = mon->y; 534 y = mon->y;
530 m = mon->map; 535 m = mon->map;
531 dir = rv.direction; 536 dir = rv.direction;
532 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 537 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
533 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 538 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
539
534 /* If we can't solve it within the search distance, return now. */ 540 /* If we can't solve it within the search distance, return now. */
535 if (diff > max) 541 if (diff > max)
536 return 0; 542 return 0;
543
537 while (diff > 1 && max > 0) 544 while (diff > 1 && max > 0)
538 { 545 {
539 lastx = x; 546 lastx = x;
540 lasty = y; 547 lasty = y;
541 lastmap = m; 548 lastmap = m;
… …
623 max--; 630 max--;
624 lastdir = dir; 631 lastdir = dir;
625 if (!firstdir) 632 if (!firstdir)
626 firstdir = dir; 633 firstdir = dir;
627 } 634 }
635
628 if (diff <= 1) 636 if (diff <= 1)
629 { 637 {
630 /* Recalculate diff (distance) because we may not have actually 638 /* Recalculate diff (distance) because we may not have actually
631 * headed toward player for entire distance. 639 * headed toward player for entire distance.
632 */ 640 */
633 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 641 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
634 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 642 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
635 } 643 }
644
636 if (diff > max) 645 if (diff > max)
637 return 0; 646 return 0;
638 } 647 }
648
639 /* If we reached the max, didn't find a direction in time */ 649 /* If we reached the max, didn't find a direction in time */
640 if (!max) 650 if (!max)
641 return 0; 651 return 0;
642 652
643 return firstdir; 653 return firstdir;
… …
757roll_stat (void) 767roll_stat (void)
758{ 768{
759 int a[4], i, j, k; 769 int a[4], i, j, k;
760 770
761 for (i = 0; i < 4; i++) 771 for (i = 0; i < 4; i++)
762 a[i] = (int) RANDOM () % 6 + 1; 772 a[i] = (int) rndm (6) + 1;
763 773
764 for (i = 0, j = 0, k = 7; i < 4; i++) 774 for (i = 0, j = 0, k = 7; i < 4; i++)
765 if (a[i] < k) 775 if (a[i] < k)
766 k = a[i], j = i; 776 k = a[i], j = i;
767 777
… …
773} 783}
774 784
775void 785void
776object::roll_stats () 786object::roll_stats ()
777{ 787{
778 int statsort [7]; 788 int statsort [NUM_STATS];
779 789
780 for (;;) 790 for (;;)
781 { 791 {
782 int sum = 0; 792 int sum = 0;
783 for (int i = 7; i--; ) 793 for (int i = NUM_STATS; i--; )
784 sum += statsort [i] = roll_stat (); 794 sum += statsort [i] = roll_stat ();
785 795
786 if (sum >= 82 && sum <= 116) 796 if (sum >= 82 && sum <= 116)
787 break; 797 break;
788 } 798 }
789 799
790 // Sort the stats so that rerolling is easier... 800 // Sort the stats so that rerolling is easier...
791 std::sort (statsort, statsort + 7, std::greater<int>()); 801 std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
792 802
803 for (int i = 0; i < NUM_STATS; ++i)
793 stats.Str = statsort[0]; 804 stats.stat (i) = statsort [i];
794 stats.Dex = statsort[1];
795 stats.Con = statsort[2];
796 stats.Int = statsort[3];
797 stats.Wis = statsort[4];
798 stats.Pow = statsort[5];
799 stats.Cha = statsort[6];
800 805
801 stats.exp = 0; 806 stats.exp = 0;
802 stats.ac = 0; 807 stats.ac = 0;
803 808
804 stats.hp = stats.maxhp; 809 stats.hp = stats.maxhp;
… …
816} 821}
817 822
818void 823void
819object::swap_stats (int a, int b) 824object::swap_stats (int a, int b)
820{ 825{
821 int tmp = get_attr_value (&contr->orig_stats, a); 826 swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
822 set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
823 set_attr_value (&contr->orig_stats, b, tmp);
824 827
828 for (int i = 0; i < NUM_STATS; ++i)
825 stats.Str = contr->orig_stats.Str; 829 stats.stat (i) = contr->orig_stats.stat (i);
826 stats.Dex = contr->orig_stats.Dex;
827 stats.Con = contr->orig_stats.Con;
828 stats.Int = contr->orig_stats.Int;
829 stats.Wis = contr->orig_stats.Wis;
830 stats.Pow = contr->orig_stats.Pow;
831 stats.Cha = contr->orig_stats.Cha;
832 830
833 //TODO: the following code looks so borked and should, at the very least, 831 //TODO: the following code looks so borked and should, at the very least,
834 // be merged with the similar code in roll_stats 832 // be merged with the similar code in roll_stats
835 stats.ac = 0; 833 stats.ac = 0;
836 834
… …
848 contr->levsp[1] = 6; 846 contr->levsp[1] = 6;
849 contr->levgrace[1] = 3; 847 contr->levgrace[1] = 3;
850 848
851 contr->orig_stats = stats; 849 contr->orig_stats = stats;
852 } 850 }
851}
852
853static void
854start_info (object *op)
855{
856 char buf[MAX_BUF];
857
858 sprintf (buf, "Welcome to Crossfire v%s!", VERSION);
859 new_draw_info (NDI_UNIQUE, 0, op, buf);
860 //new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
861 //new_draw_info (NDI_UNIQUE, 0, op, " ");
853} 862}
854 863
855/* This function takes the key that is passed, and does the 864/* This function takes the key that is passed, and does the
856 * appropriate action with it (change race, or other things). 865 * appropriate action with it (change race, or other things).
857 * The function name is for historical reasons - now we have 866 * The function name is for historical reasons - now we have
858 * separate race and class; this actually changes the RACE, 867 * separate race and class; this actually changes the RACE,
859 * not the class. 868 * not the class.
860 */ 869 */
861int 870void
862key_change_class (object *op, char key) 871player::chargen_race_done ()
863{ 872{
864 int tmp_loop;
865
866 if (key == 'd' || key == 'D')
867 {
868 char buf[MAX_BUF];
869
870 /* this must before then initial items are given */ 873 /* this must before then initial items are given */
871 esrv_new_player (op->contr, op->weight + op->carrying); 874 esrv_new_player (ob->contr, ob->weight + ob->carrying);
872 875
873 treasurelist *tl = find_treasurelist ("starting_wealth"); 876 treasurelist *tl = treasurelist::find ("starting_wealth");
874 if (tl) 877 if (tl)
875 create_treasure (tl, op, 0, 0, 0); 878 create_treasure (tl, ob, 0, 0, 0);
876 879
877 INVOKE_PLAYER (BIRTH, op->contr); 880 INVOKE_PLAYER (BIRTH, ob->contr);
878 INVOKE_PLAYER (LOGIN, op->contr); 881 INVOKE_PLAYER (LOGIN, ob->contr);
879 882
880 op->contr->ns->state = ST_PLAYING; 883 ob->contr->ns->state = ST_PLAYING;
881 884
882 if (op->msg) 885 if (ob->msg)
883 op->msg = NULL; 886 ob->msg = 0;
884 887
885 /* We create this now because some of the unique maps will need it 888 /* We create this now because some of the unique maps will need it
886 * to save here. 889 * to save here.
887 */ 890 */
891 {
892 char buf[MAX_BUF];
888 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 893 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
889 make_path_to_file (buf); 894 make_path_to_file (buf);
895 }
890 896
891#ifdef AUTOSAVE
892 op->contr->last_save_tick = pticks;
893#endif
894 start_info (op); 897 start_info (ob);
895 CLEAR_FLAG (op, FLAG_WIZ); 898 CLEAR_FLAG (ob, FLAG_WIZ);
896 give_initial_items (op, op->randomitems); 899 give_initial_items (ob, ob->randomitems);
897 link_player_skills (op); 900 link_player_skills (ob);
898 esrv_send_inventory (op, op); 901 esrv_send_inventory (ob, ob);
899 op->update_stats (); 902 ob->update_stats ();
900 903
901 /* This moves the player to a different start map, if there 904 /* This moves the player to a different start map, if there
902 * is one for this race 905 * is one for this race
903 */ 906 */
904 if (*first_map_ext_path) 907 if (*first_map_ext_path)
905 { 908 {
906 object *tmp; 909 object *tmp;
907 char mapname[MAX_BUF]; 910 char mapname[MAX_BUF];
908 911
909 snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name); 912 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
910 tmp = object::create (); 913 tmp = object::create ();
911 EXIT_PATH (tmp) = mapname; 914 EXIT_PATH (tmp) = mapname;
912 EXIT_X (tmp) = op->x; 915 EXIT_X (tmp) = ob->x;
913 EXIT_Y (tmp) = op->y; 916 EXIT_Y (tmp) = ob->y;
914 enter_exit (op, tmp); /* we don't really care if it succeeded; 917 ob->enter_exit (tmp); /* we don't really care if it succeeded;
915 * if the map isn't there, then stay on the 918 * if the map isn't there, then stay on the
916 * default initial map */ 919 * default initial map */
917 tmp->destroy (); 920 tmp->destroy ();
918 } 921 }
919 else 922 else
920 LOG (llevDebug, "first_map_ext_path not set\n"); 923 LOG (llevDebug, "first_map_ext_path not set\n");
924}
921 925
922 return 0; 926void
923 } 927player::chargen_race_next ()
924 928{
925 /* Following actually changes the race - this is the default command 929 /* Following actually changes the race - this is the default command
926 * if we don't match with one of the options above. 930 * if we don't match with one of the options above.
927 */ 931 */
928 932
929 tmp_loop = 0; 933 do
930 while (!tmp_loop)
931 { 934 {
932 shstr name = op->name; 935 shstr name = ob->name;
933 int x = op->x, y = op->y; 936 int x = ob->x, y = ob->y;
934 937
935 op->remove_statbonus (); 938 ob->remove_statbonus ();
936 op->remove (); 939 ob->remove ();
937 op->arch = get_player_archetype (op->arch); 940 ob->arch = get_player_archetype (ob->arch);
938 op->arch->clone.copy_to (op); 941 ob->arch->clone.copy_to (ob);
939 op->instantiate (); 942 ob->instantiate ();
940 op->stats = op->contr->orig_stats; 943 ob->stats = ob->contr->orig_stats;
941 op->name = op->name_pl = name; 944 ob->name = ob->name_pl = name;
942 op->x = x; 945 ob->x = x;
943 op->y = y; 946 ob->y = y;
944 SET_ANIMATION (op, 2); /* So player faces south */ 947 SET_ANIMATION (ob, 2); /* So player faces south */
945 insert_ob_in_map (op, op->map, op, 0); 948 insert_ob_in_map (ob, ob->map, ob, 0);
946 assign (op->contr->title, op->arch->clone.name); 949 assign (ob->contr->title, ob->arch->clone.name);
947 op->add_statbonus (); 950 ob->add_statbonus ();
948 tmp_loop = allowed_class (op);
949 } 951 }
952 while (!allowed_class (ob));
950 953
951 update_object (op, UP_OBJ_FACE); 954 update_object (ob, UP_OBJ_FACE);
952 esrv_update_item (UPD_FACE, op, op); 955 esrv_update_item (UPD_FACE, ob, ob);
953 op->update_stats (); 956 ob->update_stats ();
954 op->stats.hp = op->stats.maxhp; 957 ob->stats.hp = ob->stats.maxhp;
955 op->stats.sp = op->stats.maxsp; 958 ob->stats.sp = ob->stats.maxsp;
956 op->stats.grace = 0; 959 ob->stats.grace = 0;
957
958 if (op->msg)
959 new_draw_info (NDI_BLUE, 0, op, op->msg);
960
961 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
962 return 0;
963}
964
965int
966key_confirm_quit (object *op, char key)
967{
968 if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
969 {
970 op->contr->ns->state = ST_PLAYING;
971 new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
972 return 1;
973 }
974
975 INVOKE_PLAYER (LOGOUT, op->contr);
976 INVOKE_PLAYER (QUIT, op->contr);
977
978 op->contr->enable_save = false;
979
980 terminate_all_pets (op);
981 leave_map (op);
982 op->direction = 0;
983 new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
984
985 strcpy (op->contr->killer, "quit");
986 check_score (op);
987 op->contr->party = 0;
988 op->contr->own_title[0] = '\0';
989
990 object_ptr ob = op;
991
992 /* We need to hunt for any per player unique maps in memory and
993 * get rid of them. The trailing slash in the path is intentional,
994 * so that players named 'Ab' won't match against players 'Abe' pathname
995 */
996 char buf[MAX_BUF];
997 sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
998
999 for_all_maps (mp)
1000 if (!strncmp (mp->path, buf, strlen (buf)))
1001 delete_map (mp);
1002
1003 delete_character (ob->name, 1);
1004 ob->contr->destroy ();
1005
1006 return 1;
1007} 960}
1008 961
1009void 962void
1010flee_player (object *op) 963flee_player (object *op)
1011{ 964{
… …
1058 /* Cornered, get rid of scared */ 1011 /* Cornered, get rid of scared */
1059 CLEAR_FLAG (op, FLAG_SCARED); 1012 CLEAR_FLAG (op, FLAG_SCARED);
1060 op->enemy = NULL; 1013 op->enemy = NULL;
1061} 1014}
1062 1015
1063
1064/* check_pick sees if there is stuff to be picked up/picks up stuff. 1016/* check_pick sees if there is stuff to be picked up/picks up stuff.
1065 * IT returns 1 if the player should keep on moving, 0 if he should 1017 * It returns 1 if the player should keep on moving, 0 if he should
1066 * stop. 1018 * stop.
1067 */ 1019 */
1068int 1020int
1069check_pick (object *op) 1021check_pick (object *op)
1070{ 1022{
1071 object *tmp, *next; 1023 object *tmp, *next;
1072 int stop = 0; 1024 int stop = 0;
1073 int j, k, wvratio; 1025 int wvratio;
1074 char putstring[128], tmpstr[16]; 1026 char putstring[128];
1075 1027
1076 /* if you're flying, you cna't pick up anything */ 1028 /* if you're flying, you cna't pick up anything */
1077 if (op->move_type & MOVE_FLYING) 1029 if (op->move_type & MOVE_FLYING)
1078 return 1; 1030 return 1;
1079 1031
… …
1416 * found object is returned. 1368 * found object is returned.
1417 */ 1369 */
1418object * 1370object *
1419find_arrow (object *op, const char *type) 1371find_arrow (object *op, const char *type)
1420{ 1372{
1421 object *tmp = NULL; 1373 object *tmp = 0;
1422 1374
1423 for (op = op->inv; op; op = op->below) 1375 for (op = op->inv; op; op = op->below)
1424 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) 1376 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1425 tmp = find_arrow (op, type); 1377 tmp = find_arrow (op, type);
1426 else if (op->type == ARROW && op->race == type) 1378 else if (op->type == ARROW && op->race == type)
1427 return op; 1379 return op;
1380
1428 return tmp; 1381 return tmp;
1429} 1382}
1430 1383
1431/* 1384/*
1432 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1385 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1433 * against the target. A full test is not performed, simply a basic test 1386 * against the target. A full test is not performed, simply a basic test
1434 * of resistances. The archer is making a quick guess at what he sees down 1387 * of resistances. The archer is making a quick guess at what he sees down
1435 * the hall. Failing that it does it's best to pick the highest plus arrow. 1388 * the hall. Failing that it does it's best to pick the highest plus arrow.
1436 */ 1389 */
1437
1438object * 1390object *
1439find_better_arrow (object *op, object *target, const char *type, int *better) 1391find_better_arrow (object *op, object *target, const char *type, int *better)
1440{ 1392{
1441 object *tmp = NULL, *arrow, *ntmp; 1393 object *tmp = NULL, *arrow, *ntmp;
1442 int attacknum, attacktype, betterby = 0, i; 1394 int attacknum, attacktype, betterby = 0, i;
… …
1508 * find_better_arrow to find a decent arrow to use. 1460 * find_better_arrow to find a decent arrow to use.
1509 * op = the shooter 1461 * op = the shooter
1510 * type = bow->race 1462 * type = bow->race
1511 * dir = fire direction 1463 * dir = fire direction
1512 */ 1464 */
1513
1514object * 1465object *
1515pick_arrow_target (object *op, const char *type, int dir) 1466pick_arrow_target (object *op, const char *type, int dir)
1516{ 1467{
1517 object *tmp = NULL; 1468 object *tmp = NULL;
1518 maptile *m; 1469 maptile *m;
… …
1583 */ 1534 */
1584int 1535int
1585fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy) 1536fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1586{ 1537{
1587 object *left, *bow; 1538 object *left, *bow;
1588 int bowspeed, mflags; 1539 int mflags;
1589 maptile *m; 1540 maptile *m;
1590 1541
1591 if (!dir) 1542 if (!dir)
1592 { 1543 {
1593 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1544 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1594 return 0; 1545 return 0;
1595 } 1546 }
1596 1547
1597 if (op->type == PLAYER) 1548 if (op->contr)
1598 bow = op->contr->ranges[range_bow]; 1549 bow = op->current_weapon;
1599 else 1550 else
1600 { 1551 {
1601 for (bow = op->inv; bow; bow = bow->below) 1552 for (bow = op->inv; bow; bow = bow->below)
1602 /* Don't check for applied - monsters don't apply bows - in that way, they 1553 /* Don't check for applied - monsters don't apply bows - in that way, they
1603 * don't need to switch back and forth between bows and weapons. 1554 * don't need to switch back and forth between bows and weapons.
… …
1608 if (!bow) 1559 if (!bow)
1609 { 1560 {
1610 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1561 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1611 return 0; 1562 return 0;
1612 } 1563 }
1564
1565 // optimisation: move object to top so we will find it quickly again
1566 if (bow->below)
1567 {
1568 bow->remove ();
1569 op->insert (bow);
1570 }
1571
1613 } 1572 }
1614 1573
1615 if (!bow->race || !bow->skill) 1574 if (!bow->race || !bow->skill)
1616 { 1575 {
1617 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1576 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1618 return 0; 1577 return 0;
1619 } 1578 }
1620
1621 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1622
1623 /* penalize ROF for bestarrow */
1624 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1625 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1626
1627 if (bowspeed < 1)
1628 bowspeed = 1;
1629 1579
1630 if (arrow == NULL) 1580 if (arrow == NULL)
1631 { 1581 {
1632 if ((arrow = find_arrow (op, bow->race)) == NULL) 1582 if ((arrow = find_arrow (op, bow->race)) == NULL)
1633 { 1583 {
1634 if (op->type == PLAYER) 1584 if (op->type == PLAYER)
1635 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1585 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1636 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1586 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1637 else 1587 else
1638 CLEAR_FLAG (op, FLAG_READY_BOW); 1588 CLEAR_FLAG (op, FLAG_READY_BOW);
1589
1639 return 0; 1590 return 0;
1640 } 1591 }
1641 } 1592 }
1642 1593
1643 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1594 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
… …
1667 1618
1668 arrow->set_owner (op); 1619 arrow->set_owner (op);
1669 arrow->skill = bow->skill; 1620 arrow->skill = bow->skill;
1670 arrow->direction = dir; 1621 arrow->direction = dir;
1671 1622
1623 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1624 arrow->stats.hp = arrow->stats.dam;
1625 arrow->stats.grace = arrow->attacktype;
1626
1627 if (arrow->slaying)
1628 arrow->spellarg = strdup (arrow->slaying);
1629
1630#if 0
1631 if (player *pl = op->contr)
1632 {
1633 float speed = pl->weapon_sp;
1634
1635 /* penalize ROF for bestarrow */
1636 if (pl->bowtype == bow_bestarrow)
1637 speed *= .9f;
1638 else
1639 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1640
1641 op->speed_left += speed - op->speed;
1642 }
1643#endif
1644
1645 SET_ANIMATION (arrow, arrow->direction);
1646
1647 /* update the speed */
1648 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1649 + bow->stats.dam / 7.f;
1650
1651 arrow->set_speed (max (arrow->speed, 2.f));
1652 arrow->speed_left = 0;
1653
1654 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1655
1672 if (op->type == PLAYER) 1656 if (op->type == PLAYER)
1673 { 1657 {
1674 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1675 op->update_stats ();
1676 }
1677
1678 SET_ANIMATION (arrow, arrow->direction);
1679 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1680 arrow->stats.hp = arrow->stats.dam;
1681 arrow->stats.grace = arrow->attacktype;
1682 if (arrow->slaying != NULL)
1683 arrow->spellarg = strdup (arrow->slaying);
1684
1685 /* Note that this was different for monsters - they got their level
1686 * added to the damage. I think the strength bonus is more proper.
1687 */
1688
1689 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1690
1691 /* update the speed */
1692 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1693 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1694
1695 arrow->set_speed (max (arrow->speed, 1.0));
1696 arrow->speed_left = 0;
1697
1698 if (op->type == PLAYER)
1699 {
1700 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1701 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1702 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1703
1704 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1658 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1659 wc -= dex_bonus[op->stats.Dex];
1660
1661 if (!arrow->slaying)
1662 arrow->slaying = op->slaying;
1663
1664 arrow->attacktype |= op->attacktype;
1705 } 1665 }
1706 else 1666 else
1707 { 1667 {
1708 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1709 arrow->level = op->level; 1668 arrow->level = op->level;
1710 } 1669 arrow->stats.wc -= bow->magic;
1711 1670
1712 if (arrow->attacktype == AT_PHYSICAL) 1671 if (!arrow->slaying)
1672 arrow->slaying = bow->slaying;
1673
1713 arrow->attacktype |= bow->attacktype; 1674 arrow->attacktype |= bow->attacktype;
1675 }
1714 1676
1715 if (bow->slaying) 1677 wc -= arrow->level;
1716 arrow->slaying = bow->slaying; 1678 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1717 1679
1680 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1718 arrow->move_type = MOVE_FLY_LOW; 1681 arrow->move_type = MOVE_FLY_LOW;
1719 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1682 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1720 1683
1721 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1684 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1722 m->insert (arrow, sx, sy, op); 1685 m->insert (arrow, sx, sy, op);
… …
1747{ 1710{
1748 int ret = 0, wcmod = 0; 1711 int ret = 0, wcmod = 0;
1749 1712
1750 if (op->contr->bowtype == bow_bestarrow) 1713 if (op->contr->bowtype == bow_bestarrow)
1751 { 1714 {
1752 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1715 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1753 } 1716 }
1754 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1717 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1755 { 1718 {
1756 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1719 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1757 wcmod = -1; 1720 wcmod = -1;
1721
1758 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); 1722 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1759 } 1723 }
1760 else if (op->contr->bowtype == bow_threewide) 1724 else if (op->contr->bowtype == bow_threewide)
1761 { 1725 {
1762 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1726 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
… …
1766 else if (op->contr->bowtype == bow_spreadshot) 1730 else if (op->contr->bowtype == bow_spreadshot)
1767 { 1731 {
1768 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1732 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1769 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1733 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1770 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1734 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1771
1772 } 1735 }
1773 else 1736 else
1774 { 1737 {
1775 /* Simple case */ 1738 /* Simple case */
1776 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1739 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1777 } 1740 }
1741
1778 return ret; 1742 return ret;
1779} 1743}
1780
1781 1744
1782/* Fires a misc (wand/rod/horn) object in 'dir'. 1745/* Fires a misc (wand/rod/horn) object in 'dir'.
1783 * Broken apart from 'fire' to keep it more readable. 1746 * Broken apart from 'fire' to keep it more readable.
1784 */ 1747 */
1785void 1748void
1786fire_misc_object (object *op, int dir) 1749fire_misc_object (object *op, int dir)
1787{ 1750{
1788 object *item; 1751 object *item = op->contr->ranged_ob;
1789 1752
1790 if (!op->contr->ranges[range_misc]) 1753 if (!item)
1791 { 1754 {
1792 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); 1755 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1793 return; 1756 return;
1794 } 1757 }
1795 1758
1796 item = op->contr->ranges[range_misc];
1797 if (!item->inv) 1759 if (!item->inv)
1798 { 1760 {
1799 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1761 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1800 return; 1762 return;
1801 } 1763 }
1764
1765 if (!op->change_weapon (item))
1766 return;
1767
1802 if (item->type == WAND) 1768 if (item->type == WAND)
1803 { 1769 {
1804 if (item->stats.food <= 0) 1770 if (item->stats.food <= 0)
1805 { 1771 {
1806 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1772 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1807 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1773 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1774
1808 return; 1775 return;
1809 } 1776 }
1810 } 1777 }
1811 else if (item->type == ROD || item->type == HORN) 1778 else if (item->type == ROD || item->type == HORN)
1812 { 1779 {
1813 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1780 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1814 { 1781 {
1815 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1782 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1783
1816 if (item->type == ROD) 1784 if (item->type == ROD)
1817 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1785 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1818 else 1786 else
1819 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1787 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1788
1820 return; 1789 return;
1821 } 1790 }
1822 } 1791 }
1823 1792
1824 if (cast_spell (op, item, dir, item->inv, NULL)) 1793 if (cast_spell (op, item, dir, item->inv, NULL))
… …
1846 } 1815 }
1847} 1816}
1848 1817
1849/* Received a fire command for the player - go and do it. 1818/* Received a fire command for the player - go and do it.
1850 */ 1819 */
1851void 1820bool
1852fire (object *op, int dir) 1821fire (object *op, int dir)
1853{ 1822{
1854 int spellcost = 0; 1823 int spellcost = 0;
1855 1824
1856 /* check for loss of invisiblity/hide */ 1825 /* check for loss of invisiblity/hide */
1857 if (action_makes_visible (op)) 1826 if (action_makes_visible (op))
1858 make_visible (op); 1827 make_visible (op);
1859 1828
1860 switch (op->contr->shoottype) 1829 player *pl = op->contr;
1830
1831 if (pl->golem)
1832 {
1833 control_golem (op->contr->golem, dir);
1834 return false;
1861 { 1835 }
1862 case range_none:
1863 return;
1864 1836
1865 case range_bow: 1837 object *ob = pl->ranged_ob;
1838
1839 if (!ob)
1840 return false;
1841
1842 if (!op->change_weapon (ob))
1843 return false;
1844
1845 if (op->speed_left > 0.f)
1846 --op->speed_left;
1847 else
1848 return false;
1849
1850 switch (ob->type)
1851 {
1852 case BOW:
1866 player_fire_bow (op, dir); 1853 player_fire_bow (op, dir);
1867 return; 1854 break;
1868 1855
1869 case range_magic: /* Casting spells */ 1856 case SPELL:
1870 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1857 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1871 return; 1858 break;
1872 1859
1873 case range_misc: 1860 case BUILDER:
1861 apply_map_builder (op, dir);
1862 break;
1863
1864 case SKILL:
1865 do_skill (op, op, ob, dir, 0);
1866 break;
1867
1868 default:
1874 fire_misc_object (op, dir); 1869 fire_misc_object (op, dir);
1875 return; 1870 break;
1876
1877 case range_golem: /* Control summoned monsters from scrolls */
1878 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1879 {
1880 op->contr->ranges[range_golem] = 0;
1881 op->contr->shoottype = range_none;
1882 }
1883 else
1884 control_golem (op->contr->ranges[range_golem], dir);
1885 return;
1886
1887 case range_skill:
1888 if (!op->chosen_skill)
1889 {
1890 if (op->type == PLAYER)
1891 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1892 return;
1893 }
1894 (void) do_skill (op, op, op->chosen_skill, dir, NULL);
1895 return;
1896 case range_builder:
1897 apply_map_builder (op, dir);
1898 return;
1899 default:
1900 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1901 return;
1902 } 1871 }
1903}
1904 1872
1905 1873 return true;
1874}
1906 1875
1907/* find_key 1876/* find_key
1908 * We try to find a key for the door as passed. If we find a key 1877 * We try to find a key for the door as passed. If we find a key
1909 * and successfully use it, we return the key, otherwise NULL 1878 * and successfully use it, we return the key, otherwise NULL
1910 * This function merges both normal and locked door, since the logic 1879 * This function merges both normal and locked door, since the logic
… …
1912 * pl is the player, 1881 * pl is the player,
1913 * inv is the objects inventory to searched 1882 * inv is the objects inventory to searched
1914 * door is the door we are trying to match against. 1883 * door is the door we are trying to match against.
1915 * This function can be called recursively to search containers. 1884 * This function can be called recursively to search containers.
1916 */ 1885 */
1917
1918object * 1886object *
1919find_key (object *pl, object *container, object *door) 1887find_key (object *pl, object *container, object *door)
1920{ 1888{
1921 object *tmp, *key; 1889 object *tmp, *key;
1922 1890
1923 /* Should not happen, but sanity checking is never bad */ 1891 /* Should not happen, but sanity checking is never bad */
1924 if (container->inv == NULL) 1892 if (!container->inv)
1925 return NULL; 1893 return 0;
1926 1894
1927 /* First, lets try to find a key in the top level inventory */ 1895 /* First, lets try to find a key in the top level inventory */
1928 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1896 for (tmp = container->inv; tmp; tmp = tmp->below)
1929 { 1897 {
1930 if (door->type == DOOR && tmp->type == KEY) 1898 if (door->type == DOOR && tmp->type == KEY)
1931 break; 1899 break;
1932 /* For sanity, we should really check door type, but other stuff 1900 /* For sanity, we should really check door type, but other stuff
1933 * (like containers) can be locked with special keys 1901 * (like containers) can be locked with special keys
1934 */ 1902 */
1935 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1903 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1936 break; 1904 break;
1937 } 1905 }
1906
1938 /* No key found - lets search inventories now */ 1907 /* No key found - lets search inventories now */
1939 /* If we find and use a key in an inventory, return at that time. 1908 /* If we find and use a key in an inventory, return at that time.
1940 * otherwise, if we search all the inventories and still don't find 1909 * otherwise, if we search all the inventories and still don't find
1941 * a key, return 1910 * a key, return
1942 */ 1911 */
1943 if (!tmp) 1912 if (!tmp)
1944 { 1913 {
1945 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1914 for (tmp = container->inv; tmp; tmp = tmp->below)
1946 { 1915 {
1947 /* No reason to search empty containers */ 1916 /* No reason to search empty containers */
1948 if (tmp->type == CONTAINER && tmp->inv) 1917 if (tmp->type == CONTAINER && tmp->inv)
1949 { 1918 {
1950 if ((key = find_key (pl, tmp, door)) != NULL) 1919 if ((key = find_key (pl, tmp, door)))
1951 return key; 1920 return key;
1952 } 1921 }
1953 } 1922 }
1923
1954 if (!tmp) 1924 if (!tmp)
1955 return NULL; 1925 return NULL;
1956 } 1926 }
1927
1957 /* We get down here if we have found a key. Now if its in a container, 1928 /* We get down here if we have found a key. Now if its in a container,
1958 * see if we actually want to use it 1929 * see if we actually want to use it
1959 */ 1930 */
1960 if (pl != container) 1931 if (pl != container)
1961 { 1932 {
… …
1982 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1953 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1983 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1954 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1984 return NULL; 1955 return NULL;
1985 } 1956 }
1986 } 1957 }
1958
1987 return tmp; 1959 return tmp;
1988} 1960}
1989 1961
1990/* moved door processing out of move_player_attack. 1962/* moved door processing out of move_player_attack.
1991 * returns 1 if player has opened the door with a key 1963 * returns 1 if player has opened the door with a key
… …
1993 * 0 otherwise 1965 * 0 otherwise
1994 */ 1966 */
1995static int 1967static int
1996player_attack_door (object *op, object *door) 1968player_attack_door (object *op, object *door)
1997{ 1969{
1998 /* If its a door, try to find a use a key. If we do destroy the door, 1970 /* If its a door, try to find a key. If we do destroy the door,
1999 * might as well return immediately as there is nothing more to do - 1971 * might as well return immediately as there is nothing more to do -
2000 * otherwise, we fall through to the rest of the code. 1972 * otherwise, we fall through to the rest of the code.
2001 */ 1973 */
2002 object *key = find_key (op, op, door); 1974 object *key = find_key (op, op, door);
2003 1975
2004 /* IF we found a key, do some extra work */ 1976 /* If we found a key, do some extra work */
2005 if (key) 1977 if (key)
2006 { 1978 {
2007 object *container = key->env; 1979 object *container = key->env;
2008 1980
2009 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); 1981 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1982
2010 if (action_makes_visible (op)) 1983 if (action_makes_visible (op))
2011 make_visible (op); 1984 make_visible (op);
1985
2012 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1986 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2013 spring_trap (door->inv, op); 1987 spring_trap (door->inv, op);
1988
2014 if (door->type == DOOR) 1989 if (door->type == DOOR)
2015 {
2016 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1990 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2017 }
2018 else if (door->type == LOCKED_DOOR) 1991 else if (door->type == LOCKED_DOOR)
2019 { 1992 {
2020 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1993 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
2021 remove_door2 (door); /* remove door without violence ;-) */ 1994 remove_door2 (door); /* remove door without violence ;-) */
2022 } 1995 }
1996
2023 /* Do this after we print the message */ 1997 /* Do this after we print the message */
2024 decrease_ob (key); /* Use up one of the keys */ 1998 decrease_ob (key); /* Use up one of the keys */
2025 /* Need to update the weight the container the key was in */ 1999 /* Need to update the weight the container the key was in */
2026 if (container != op) 2000 if (container != op)
2027 esrv_update_item (UPD_WEIGHT, op, container); 2001 esrv_update_item (UPD_WEIGHT, op, container);
2002
2028 return 1; /* Nothing more to do below */ 2003 return 1; /* Nothing more to do below */
2029 } 2004 }
2030 else if (door->type == LOCKED_DOOR) 2005 else if (door->type == LOCKED_DOOR)
2031 { 2006 {
2032 /* Might as well return now - no other way to open this */ 2007 /* Might as well return now - no other way to open this */
2033 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 2008 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2034 return 1; 2009 return 1;
2035 } 2010 }
2011
2036 return 0; 2012 return 0;
2037} 2013}
2038 2014
2039/* This function is just part of a breakup from move_player. 2015/* This function is just part of a breakup from move_player.
2040 * It should keep the code cleaner. 2016 * It should keep the code cleaner.
2041 * When this is called, the players direction has been updated 2017 * When this is called, the players direction has been updated
2042 * (taking into account confusion.) The player is also actually 2018 * (taking into account confusion.) The player is also actually
2043 * going to try and move (not fire weapons). 2019 * going to try and move (not fire weapons).
2044 */ 2020 */
2045void 2021bool
2046move_player_attack (object *op, int dir) 2022move_player_attack (object *op, int dir)
2047{ 2023{
2048 object *tmp, *mon;
2049 sint16 nx, ny;
2050 int on_battleground; 2024 int on_battleground;
2051 maptile *m;
2052 2025
2053 nx = freearr_x[dir] + op->x; 2026 sint16 nx = freearr_x[dir] + op->x;
2054 ny = freearr_y[dir] + op->y; 2027 sint16 ny = freearr_y[dir] + op->y;
2055 2028
2056 on_battleground = op_on_battleground (op, 0, 0); 2029 on_battleground = op_on_battleground (op, 0, 0);
2030
2031 if (out_of_map (op->map, nx, ny))
2032 return false;
2033
2034 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2035 {
2036 --op->speed_left;
2037 return true;
2038 }
2057 2039
2058 /* If braced, or can't move to the square, and it is not out of the 2040 /* If braced, or can't move to the square, and it is not out of the
2059 * map, attack it. Note order of if statement is important - don't 2041 * map, attack it. Note order of if statement is important - don't
2060 * want to be calling move_ob if braced, because move_ob will move the 2042 * want to be calling move_ob if braced, because move_ob will move the
2061 * player. This is a pretty nasty hack, because if we could 2043 * player. This is a pretty nasty hack, because if we could
2062 * move to some space, it then means that if we are braced, we should 2044 * move to some space, it then means that if we are braced, we should
2063 * do nothing at all. As it is, if we are braced, we go through 2045 * do nothing at all. As it is, if we are braced, we go through
2064 * quite a bit of processing. However, it probably is less than what 2046 * quite a bit of processing. However, it probably is less than what
2065 * move_ob uses. 2047 * move_ob uses.
2066 */ 2048 */
2067 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny)) 2049 maptile *m = op->map->xy_find (nx, ny);
2068 {
2069 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2070 {
2071 m = get_map_from_coord (op->map, &nx, &ny);
2072 if (!m)
2073 return; /* Don't think this should happen */
2074 }
2075 else
2076 m = op->map;
2077 2050
2078 if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)
2079 {
2080 /* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2081 return;
2082 }
2083
2084 mon = 0;
2085 /* Go through all the objects, and find ones of interest. Only stop if 2051 /* Go through all the objects, and find ones of interest. Only stop if
2086 * we find a monster - that is something we know we want to attack. 2052 * we find a monster - that is something we know we want to attack.
2087 * if its a door or barrel (can roll) see if there may be monsters 2053 * if its a door or barrel (can roll) see if there may be monsters
2088 * on the space 2054 * on the space
2089 */ 2055 */
2090 while (tmp) 2056 object *mon;
2091 { 2057 for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2092 if (tmp == op) 2058 {
2093 { 2059 if ((mon->flag [FLAG_ALIVE]
2094 tmp = tmp->above; 2060 || mon->type == LOCKED_DOOR
2095 continue; 2061 || mon->flag [FLAG_CAN_ROLL])
2096 }
2097
2098 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2099 {
2100 mon = tmp; 2062 && mon != op)
2101 break; 2063 break;
2102 } 2064 }
2103 2065
2104 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2105 mon = tmp;
2106
2107 tmp = tmp->above;
2108 }
2109
2110 if (!mon) /* This happens anytime the player tries to move */ 2066 if (!mon) /* This happens anytime the player tries to move */
2111 return; /* into a wall */ 2067 return false; /* into a wall */
2112 2068
2113 if (mon->head)
2114 mon = mon->head; 2069 mon = mon->head_ ();
2115 2070
2116 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 2071 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2072 if (op->contr->weapon_sp_left > 0.f)
2117 if (player_attack_door (op, mon)) 2073 if (player_attack_door (op, mon))
2074 {
2075 --op->contr->weapon_sp_left;
2118 return; 2076 return true;
2077 }
2119 2078
2120 /* The following deals with possibly attacking peaceful 2079 /* The following deals with possibly attacking peaceful
2121 * or frienddly creatures. Basically, all players are considered 2080 * or friendly creatures. Basically, all players are considered
2122 * unaggressive. If the moving player has peaceful set, then the 2081 * unaggressive. If the moving player has peaceful set, then the
2123 * object should be pushed instead of attacked. It is assumed that 2082 * object should be pushed instead of attacked. It is assumed that
2124 * if you are braced, you will not attack friends accidently, 2083 * if you are braced, you will not attack friends accidently,
2125 * and thus will not push them. 2084 * and thus will not push them.
2126 */ 2085 */
2127 2086
2128 /* If the creature is a pet, push it even if the player is not 2087 /* If the creature is a pet, push it even if the player is not
2129 * peaceful. Our assumption is the creature is a pet if the 2088 * peaceful. Our assumption is the creature is a pet if the
2130 * player owns it and it is either friendly or unagressive. 2089 * player owns it and it is either friendly or unagressive.
2131 */ 2090 */
2132 if ((op->type == PLAYER) 2091 if (op->type == PLAYER
2133#if COZY_SERVER
2134 &&
2135 ((mon->owner && mon->owner->contr 2092 && ((mon->owner && mon->owner->contr
2136 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op) 2093 && same_party (mon->owner->contr->party, op->contr->party))
2137#else
2138 && mon->owner == op 2094 || mon->owner == op)
2139#endif
2140 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2095 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2141 { 2096 {
2142 /* If we're braced, we don't want to switch places with it */ 2097 /* If we're braced, we don't want to switch places with it */
2143 if (op->contr->braced) 2098 if (op->contr->braced)
2144 return; 2099 return false;
2100
2101 if (op->speed_left > 0.f)
2102 {
2103 --op->speed_left;
2104
2145 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2105 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2146 (void) push_ob (mon, dir, op); 2106 push_ob (mon, dir, op);
2107
2147 if (op->contr->tmp_invis || op->hide) 2108 if (op->contr->tmp_invis || op->hide)
2148 make_visible (op); 2109 make_visible (op);
2110
2149 return; 2111 return true;
2150 } 2112 }
2113 else
2114 return false;
2115 }
2151 2116
2152 /* in certain circumstances, you shouldn't attack friendly 2117 /* in certain circumstances, you shouldn't attack friendly
2153 * creatures. Note that if you are braced, you can't push 2118 * creatures. Note that if you are braced, you can't push
2154 * someone, but put it inside this loop so that you won't 2119 * someone, but put it inside this loop so that you won't
2155 * attack them either. 2120 * attack them either.
2156 */ 2121 */
2157 if ((mon->type == PLAYER || mon->enemy != op) && 2122 if ((mon->type == PLAYER || mon->enemy != op)
2158 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2123 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2159#ifdef PROHIBIT_PLAYERKILL
2160 (op->contr->peaceful 2124 && ((op->contr->peaceful
2161 || (mon->type == PLAYER 2125 || (mon->type == PLAYER && mon->contr->peaceful))
2162 && mon->contr->
2163 peaceful)) &&
2164#else
2165 op->contr->peaceful &&
2166#endif
2167 !on_battleground)) 2126 && !on_battleground))
2127 {
2128 if (op->speed_left > 0.f)
2168 { 2129 {
2130 --op->speed_left;
2131
2169 if (!op->contr->braced) 2132 if (!op->contr->braced)
2170 { 2133 {
2171 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2134 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2172 (void) push_ob (mon, dir, op); 2135 push_ob (mon, dir, op);
2173 } 2136 }
2174 else 2137 else
2175 new_draw_info (0, 0, op, "You withhold your attack"); 2138 new_draw_info (0, 0, op, "You withhold your attack");
2176 2139
2177 if (op->contr->tmp_invis || op->hide) 2140 if (op->contr->tmp_invis || op->hide)
2178 make_visible (op); 2141 make_visible (op);
2179 }
2180 2142
2143 return true;
2144 }
2145 }
2181 /* If the object is a boulder or other rollable object, then 2146 /* If the object is a boulder or other rollable object, then
2182 * roll it if not braced. You can't roll it if you are braced. 2147 * roll it if not braced. You can't roll it if you are braced.
2183 */ 2148 */
2184 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 2149 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
2150 {
2151 if (op->speed_left > 0.f)
2185 { 2152 {
2153 --op->speed_left;
2154
2186 recursive_roll (mon, dir, op); 2155 recursive_roll (mon, dir, op);
2187 if (action_makes_visible (op)) 2156 if (action_makes_visible (op))
2188 make_visible (op); 2157 make_visible (op);
2189 }
2190 2158
2159 return true;
2160 }
2161 }
2191 /* Any generic living creature. Including things like doors. 2162 /* Any generic living creature. Including things like doors.
2192 * Way it works is like this: First, it must have some hit points 2163 * Way it works is like this: First, it must have some hit points
2193 * and be living. Then, it must be one of the following: 2164 * and be living. Then, it must be one of the following:
2194 * 1) Not a player, 2) A player, but of a different party. Note 2165 * 1) Not a player, 2) A player, but of a different party. Note
2195 * that party_number -1 is no party, so attacks can still happen. 2166 * that party_number -1 is no party, so attacks can still happen.
2196 */ 2167 */
2197
2198 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2168 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2199 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2169 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2200 { 2170 {
2201 2171 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2202 /* If the player hasn't hit something this tick, and does
2203 * so, give them speed boost based on weapon speed. Doing
2204 * it here is better than process_players2, which basically
2205 * incurred a 1 tick offset.
2206 */
2207 if (!op->contr->has_hit)
2208 { 2172 {
2209 op->speed_left += op->speed / op->contr->weapon_sp; 2173 --op->contr->weapon_sp_left;
2210
2211 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2212 }
2213 2174
2214 skill_attack (mon, op, 0, 0, 0); 2175 skill_attack (mon, op, 0, 0, 0);
2215
2216 /* If attacking another player, that player gets automatic
2217 * hitback, and doesn't loose luck either.
2218 * Disable hitback on the battleground or if the target is
2219 * the wiz.
2220 */
2221 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2222 {
2223 short luck = mon->stats.luck;
2224
2225 mon->contr->has_hit = 1;
2226 skill_attack (op, mon, 0, 0, 0);
2227 mon->stats.luck = luck;
2228 }
2229 2176
2230 if (action_makes_visible (op)) 2177 if (action_makes_visible (op))
2231 make_visible (op); 2178 make_visible (op);
2232 }
2233 } /* if player should attack something */
2234}
2235 2179
2236int 2180 return true;
2181 }
2182 }
2183
2184 return false;
2185}
2186
2187bool
2237move_player (object *op, int dir) 2188move_player (object *op, int dir)
2238{ 2189{
2239 int pick; 2190 int pick;
2240 2191
2241 if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY) 2192 if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2242 return 0; 2193 return 0;
2243 2194
2244 /* Sanity check: make sure dir is valid */ 2195 /* Sanity check: make sure dir is valid */
2245 if ((dir < 0) || (dir >= 9)) 2196 if ((dir < 0) || (dir >= 9))
2246 { 2197 {
2247 LOG (llevError, "move_player: invalid direction %d\n", dir); 2198 LOG (llevError, "move_player: invalid direction %d\n", dir);
2248 return 0; 2199 return 0;
2249 } 2200 }
2250 2201
2251 /* peterm: added following line */ 2202 /* peterm: added following line */
2252 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2203 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2253 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2204 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2254 2205
2255 op->facing = dir; 2206 op->facing = dir;
2256 2207
2257 if (op->hide) 2208 if (op->hide)
2258 do_hidden_move (op); 2209 do_hidden_move (op);
2259 2210
2211 bool retval;
2212
2260 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2213 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2261 /*nop */ ; 2214 retval = RESULT_INT (0);
2262 else if (op->contr->fire_on) 2215 else if (op->contr->fire_on)
2263 fire (op, dir); 2216 retval = fire (op, dir);
2264 else 2217 else
2265 { 2218 {
2266 move_player_attack (op, dir); 2219 retval = move_player_attack (op, dir);
2267 pick = check_pick (op); 2220 pick = check_pick (op);
2268 } 2221 }
2269 2222
2270 /* Add special check for newcs players and fire on - this way, the 2223 /* Add special check for newcs players and fire on - this way, the
2271 * server can handle repeat firing. 2224 * server can handle repeat firing.
… …
2278 /* Update how the player looks. Use the facing, so direction may 2231 /* Update how the player looks. Use the facing, so direction may
2279 * get reset to zero. This allows for full animation capabilities 2232 * get reset to zero. This allows for full animation capabilities
2280 * for players. 2233 * for players.
2281 */ 2234 */
2282 animate_object (op, op->facing); 2235 animate_object (op, op->facing);
2283 return 0; 2236
2237 return retval;
2284} 2238}
2285 2239
2286/* This is similar to handle_player, below, but is only used by the 2240/* This is similar to handle_player, below, but is only used by the
2287 * new client/server stuff. 2241 * new client/server stuff.
2288 * This is sort of special, in that the new client/server actually uses 2242 * This is sort of special, in that the new client/server actually uses
2289 * the new speed values for commands. 2243 * the new speed values for commands.
2290 * 2244 *
2291 * Returns true if there are more actions we can do. 2245 * Returns true if there are more actions we can do. Should not do
2246 * many actions in a row, as that would be too unfair to other
2247 * players.
2292 */ 2248 */
2293int 2249bool
2294handle_newcs_player (object *op) 2250handle_newcs_player (object *op)
2295{ 2251{
2296 if (op->contr->hidden)
2297 {
2298 op->invisible = 1000;
2299 /* the socket code flashes the player visible/invisible
2300 * depending on the value of invisible, so we need to
2301 * alternate it here for it to work correctly.
2302 */
2303 if (pticks & 2)
2304 op->invisible--;
2305 }
2306 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2307 {
2308 op->invisible--;
2309 if (!op->invisible)
2310 {
2311 make_visible (op);
2312 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2313 }
2314 }
2315
2316 if (QUERY_FLAG (op, FLAG_SCARED)) 2252 if (QUERY_FLAG (op, FLAG_SCARED))
2317 { 2253 {
2318 flee_player (op); 2254 if (op->speed_left > 0.f)
2319 /* If player is still scared, that is his action for this tick */
2320 if (QUERY_FLAG (op, FLAG_SCARED))
2321 { 2255 {
2322 op->speed_left--; 2256 --op->speed_left;
2257 flee_player (op);
2258
2323 return 0; 2259 return true;
2324 } 2260 }
2261 else
2262 return false;
2325 } 2263 }
2326
2327 /* I've been seeing crashes where the golem has been destroyed, but
2328 * the player object still points to the defunct golem. The code that
2329 * destroys the golem looks correct, and it doesn't always happen, so
2330 * put this in a a workaround to clean up the golem pointer.
2331 */
2332 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2333 op->contr->ranges[range_golem] = 0;
2334 2264
2335 /* call this here - we also will call this in do_ericserver, but 2265 /* call this here - we also will call this in do_ericserver, but
2336 * the players time has been increased when doericserver has been 2266 * the players time has been increased when doericserver has been
2337 * called, so we recheck it here. 2267 * called, so we recheck it here.
2338 */ 2268 */
2339 //TODO: better than handling 8 commands, use some more intelligent rate-limiting 2269 if (op->contr->ns->handle_command ())
2340 for (int rep = 8; --rep && op->contr->ns->handle_command (); )
2341 ;
2342
2343 if (op->speed_left < 0)
2344 return 0; 2270 return true;
2345 2271
2346 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2272 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2347 {
2348 /* All move commands take 1 tick, at least for now */
2349 op->speed_left--;
2350
2351 /* Instead of all the stuff below, let move_player take care
2352 * of it. Also, some of the skill stuff is only put in
2353 * there, as well as the confusion stuff.
2354 */
2355 move_player (op, op->direction); 2273 return move_player (op, op->direction);
2356 if (op->speed_left > 0)
2357 return 1;
2358 else
2359 return 0;
2360 }
2361 2274
2362 return 0; 2275 return false;
2363} 2276}
2364 2277
2365int 2278int
2366save_life (object *op) 2279save_life (object *op)
2367{ 2280{
… …
2402 * from. 2315 * from.
2403 */ 2316 */
2404void 2317void
2405remove_unpaid_objects (object *op, object *env) 2318remove_unpaid_objects (object *op, object *env)
2406{ 2319{
2407 object *next;
2408
2409 while (op) 2320 while (op)
2410 { 2321 {
2411 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2322 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2412 2323
2413 if (QUERY_FLAG (op, FLAG_UNPAID)) 2324 if (QUERY_FLAG (op, FLAG_UNPAID))
… …
2479 int rate_grace = 2000; 2390 int rate_grace = 2000;
2480 const int max_hp = 1; 2391 const int max_hp = 1;
2481 const int max_sp = 1; 2392 const int max_sp = 1;
2482 const int max_grace = 1; 2393 const int max_grace = 1;
2483 2394
2484 if (op->contr->outputs_sync) 2395 if (op->contr->hidden)
2396 {
2397 op->invisible = 1000;
2398 /* the socket code flashes the player visible/invisible
2399 * depending on the value of invisible, so we need to
2400 * alternate it here for it to work correctly.
2401 */
2402 if (pticks & 2)
2403 op->invisible--;
2485 { 2404 }
2486 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2405 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2487 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2406 {
2488 flush_output_element (op, &op->contr->outputs[i]); 2407 if (!op->invisible--)
2408 {
2409 make_visible (op);
2410 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2411 }
2489 } 2412 }
2490 2413
2491 if (op->contr->ns->state == ST_PLAYING) 2414 if (op->contr->ns->state == ST_PLAYING)
2492 { 2415 {
2493 /* these next three if clauses make it possible to SLOW DOWN 2416 /* these next three if clauses make it possible to SLOW DOWN
… …
2515 gen_grace = op->stats.maxgrace; 2438 gen_grace = op->stats.maxgrace;
2516 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2439 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2517 } 2440 }
2518 2441
2519 /* Regenerate Spell Points */ 2442 /* Regenerate Spell Points */
2520 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0) 2443 if (!op->contr->golem && --op->last_sp < 0)
2521 { 2444 {
2522 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); 2445 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2523 if (op->stats.sp < op->stats.maxsp) 2446 if (op->stats.sp < op->stats.maxsp)
2524 { 2447 {
2525 op->stats.sp++; 2448 op->stats.sp++;
… …
2623 } 2546 }
2624 2547
2625 /* Digestion */ 2548 /* Digestion */
2626 if (--op->last_eat < 0) 2549 if (--op->last_eat < 0)
2627 { 2550 {
2628#ifdef COZY_SERVER
2629 int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2630 int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2631#else
2632 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0; 2551 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2633#endif
2634 2552
2635 if (op->contr->gen_hp > 0) 2553 if (op->contr->gen_hp > 0)
2636 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2554 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2637 else 2555 else
2638 op->last_eat = 25 * (1 + bonus) / (penalty + 1); 2556 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
… …
2743 tmp->name = buf; 2661 tmp->name = buf;
2744 sprintf (buf, " This finger has been cut off %s\n" 2662 sprintf (buf, " This finger has been cut off %s\n"
2745 " the %s, when he was defeated at\n level %d by %s.\n", 2663 " the %s, when he was defeated at\n level %d by %s.\n",
2746 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2664 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2747 tmp->msg = buf; 2665 tmp->msg = buf;
2748 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2666 tmp->value = 0, tmp->type = 0;
2749 tmp->materialname = NULL; 2667 tmp->materialname = "organics";
2750 op->insert_at (tmp, op); 2668 tmp->insert_at (op, tmp);
2751 } 2669 }
2752 2670
2753 /* teleport defeated player to new destination */ 2671 /* teleport defeated player to new destination */
2754 transfer_ob (op, x, y, 0, NULL); 2672 transfer_ob (op, x, y, 0, NULL);
2755 op->contr->braced = 0; 2673 op->contr->braced = 0;
… …
2760 2678
2761 command_kill_pets (op, 0); 2679 command_kill_pets (op, 0);
2762 2680
2763 if (op->stats.food < 0) 2681 if (op->stats.food < 0)
2764 { 2682 {
2765 if (op->contr->explore)
2766 {
2767 new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2768 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2769 op->stats.food = 999;
2770 return;
2771 }
2772 sprintf (buf, "%s starved to death.", &op->name); 2683 sprintf (buf, "%s starved to death.", &op->name);
2773 strcpy (op->contr->killer, "starvation"); 2684 strcpy (op->contr->killer, "starvation");
2774 } 2685 }
2775 else 2686 else
2776 {
2777 if (op->contr->explore)
2778 {
2779 new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2780 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2781 op->stats.hp = op->stats.maxhp;
2782 return;
2783 }
2784 sprintf (buf, "%s died.", &op->name); 2687 sprintf (buf, "%s died.", &op->name);
2785 }
2786 2688
2787 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2689 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2788 2690
2789 /* save the map location for corpse, gravestone */ 2691 /* save the map location for corpse, gravestone */
2790 x = op->x; 2692 x = op->x;
… …
2966 op->stats.hp = op->stats.maxhp; 2868 op->stats.hp = op->stats.maxhp;
2967 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2869 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2968 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2870 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2969 2871
2970 /* 2872 /*
2971 * Check to see if the player is in a shop. IF so, then check to see if
2972 * the player has any unpaid items. If so, remove them and put them back 2873 * Check to see if the player has any unpaid items. If so, remove them
2973 * in the map. 2874 * and put them back in the map.
2974 */ 2875 */
2975
2976 if (is_in_shop (op))
2977 remove_unpaid_objects (op->inv, op); 2876 remove_unpaid_objects (op->inv, op);
2978 2877
2979 /****************************************/ 2878 /****************************************/
2980 /* */ 2879 /* */
2981 /* Move player to his current respawn- */ 2880 /* Move player to his current respawn- */
2982 /* position (usually last savebed) */ 2881 /* position (usually last savebed) */
2983 /* */ 2882 /* */
2984 /****************************************/ 2883 /****************************************/
2985 2884
2986 enter_player_savebed (op); 2885 enter_player_savebed (op);
2987 2886
2988 /* Save the player before inserting the force to reduce
2989 * chance of abuse.
2990 */
2991 op->contr->braced = 0; 2887 op->contr->braced = 0;
2992 op->contr->save ();
2993 2888
2994 /* it is possible that the player has blown something up 2889 /* it is possible that the player has blown something up
2995 * at his savebed location, and that can have long lasting 2890 * at his savebed location, and that can have long lasting
2996 * spell effects. So first see if there is a spell effect 2891 * spell effects. So first see if there is a spell effect
2997 * on the space that might harm the player. 2892 * on the space that might harm the player.
… …
3006 object *force; 2901 object *force;
3007 int at; 2902 int at;
3008 2903
3009 force = get_archetype (FORCE_NAME); 2904 force = get_archetype (FORCE_NAME);
3010 /* 50 ticks should be enough time for the spell to abate */ 2905 /* 50 ticks should be enough time for the spell to abate */
3011 force->speed = 0.1; 2906 force->speed = 0.1f;
3012 force->speed_left = -5.0; 2907 force->speed_left = -5.f;
3013 SET_FLAG (force, FLAG_APPLIED); 2908 SET_FLAG (force, FLAG_APPLIED);
3014 for (at = 0; at < NROFATTACKS; at++) 2909 for (at = 0; at < NROFATTACKS; at++)
3015 if (will_kill_again & (1 << at)) 2910 if (will_kill_again & (1 << at))
3016 force->resist[at] = 100; 2911 force->resist[at] = 100;
3017 2912
… …
3026void 2921void
3027loot_object (object *op) 2922loot_object (object *op)
3028{ /* Grab and destroy some treasure */ 2923{ /* Grab and destroy some treasure */
3029 object *tmp, *tmp2, *next; 2924 object *tmp, *tmp2, *next;
3030 2925
3031 if (op->container) 2926 op->close_container (); /* close open sack first */
3032 esrv_apply_container (op, op->container); /* close open sack first */
3033 2927
3034 for (tmp = op->inv; tmp; tmp = next) 2928 for (tmp = op->inv; tmp; tmp = next)
3035 { 2929 {
3036 next = tmp->below; 2930 next = tmp->below;
3037 2931
3038 if (tmp->invisible) 2932 if (tmp->invisible)
3039 continue; 2933 continue;
3040 2934
3041 tmp->remove (); 2935 tmp->remove ();
3042 tmp->x = op->x, tmp->y = op->y; 2936 tmp->x = op->x, tmp->y = op->y;
2937
3043 if (tmp->type == CONTAINER) 2938 if (tmp->type == CONTAINER)
3044 { /* empty container to ground */ 2939 loot_object (tmp); /* empty container to ground */
3045 loot_object (tmp); 2940
3046 }
3047 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2941 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3048 { 2942 {
3049 if (tmp->nrof > 1) 2943 if (tmp->nrof > 1)
3050 { 2944 {
3051 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2945 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3052 tmp2->destroy (); 2946 tmp2->destroy ();
… …
3063/* 2957/*
3064 * fix_weight(): Check recursively the weight of all players, and fix 2958 * fix_weight(): Check recursively the weight of all players, and fix
3065 * what needs to be fixed. Refresh windows and fix speed if anything 2959 * what needs to be fixed. Refresh windows and fix speed if anything
3066 * was changed. 2960 * was changed.
3067 */ 2961 */
3068
3069void 2962void
3070fix_weight (void) 2963fix_weight (void)
3071{ 2964{
3072 for_all_players (pl) 2965 for_all_players (pl)
3073 { 2966 {
… …
3133 if (op->type == PLAYER) 3026 if (op->type == PLAYER)
3134 { 3027 {
3135 op->contr->tmp_invis = 0; 3028 op->contr->tmp_invis = 0;
3136 op->contr->invis_race = 0; 3029 op->contr->invis_race = 0;
3137 } 3030 }
3031
3138 update_object (op, UP_OBJ_FACE); 3032 update_object (op, UP_OBJ_CHANGE);
3139} 3033}
3140 3034
3141int 3035int
3142is_true_undead (object *op) 3036is_true_undead (object *op)
3143{ 3037{
3144 object *tmp = NULL;
3145
3146 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3038 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3147 return 1; 3039 return 1;
3148 3040
3149 return 0; 3041 return 0;
3150} 3042}
… …
3195/* For Hidden creatures - a chance of becoming 'unhidden' 3087/* For Hidden creatures - a chance of becoming 'unhidden'
3196 * every time they move - as we subtract off 'invisibility' 3088 * every time they move - as we subtract off 'invisibility'
3197 * AND, for players, if they move into a ridiculously unhideable 3089 * AND, for players, if they move into a ridiculously unhideable
3198 * spot (surrounded by clear terrain in broad daylight). -b.t. 3090 * spot (surrounded by clear terrain in broad daylight). -b.t.
3199 */ 3091 */
3200
3201void 3092void
3202do_hidden_move (object *op) 3093do_hidden_move (object *op)
3203{ 3094{
3204 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3095 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3205 object *skop; 3096 object *skop;
… …
3209 3100
3210 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3101 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3211 3102
3212 /* its *extremely* hard to run and sneak/hide at the same time! */ 3103 /* its *extremely* hard to run and sneak/hide at the same time! */
3213 if (op->type == PLAYER && op->contr->run_on) 3104 if (op->type == PLAYER && op->contr->run_on)
3214 {
3215 if (!skop || num >= skop->level) 3105 if (!skop || num >= skop->level)
3216 { 3106 {
3217 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!"); 3107 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3218 make_visible (op); 3108 make_visible (op);
3219 return; 3109 return;
3220 } 3110 }
3221 else 3111 else
3222 num += 20; 3112 num += 20;
3223 } 3113
3224 num += op->map->difficulty; 3114 num += op->map->difficulty;
3225 hide = hideability (op); /* modify by terrain hidden level */ 3115 hide = hideability (op); /* modify by terrain hidden level */
3226 num -= hide; 3116 num -= hide;
3117
3227 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3118 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3228 { 3119 {
3229 make_visible (op); 3120 make_visible (op);
3230 if (op->type == PLAYER) 3121 if (op->type == PLAYER)
3231 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3122 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3232 } 3123 }
3233 else if (op->type == PLAYER && skop) 3124 else if (op->type == PLAYER && skop)
3234 {
3235 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3125 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3236 }
3237} 3126}
3238 3127
3239/* determine if who is standing near a hostile creature. */ 3128/* determine if who is standing near a hostile creature. */
3240 3129
3241int 3130int
… …
3308 if (pl->type != PLAYER) 3197 if (pl->type != PLAYER)
3309 { 3198 {
3310 LOG (llevError, "player_can_view() called for non-player object\n"); 3199 LOG (llevError, "player_can_view() called for non-player object\n");
3311 return -1; 3200 return -1;
3312 } 3201 }
3202
3313 if (!pl || !op) 3203 if (!pl || !op)
3314 return 0; 3204 return 0;
3315 3205
3316 if (op->head)
3317 {
3318 op = op->head; 3206 op = op->head_ ();
3319 } 3207
3320 get_rangevector (pl, op, &rv, 0x1); 3208 get_rangevector (pl, op, &rv, 0x1);
3321 3209
3322 /* starting with the 'head' part, lets loop 3210 /* starting with the 'head' part, lets loop
3323 * through the object and find if it has any 3211 * through the object and find if it has any
3324 * part that is in the los array but isnt on 3212 * part that is in the los array but isnt on
… …
3441 char buf[MAX_BUF]; /* tmp. string buffer */ 3329 char buf[MAX_BUF]; /* tmp. string buffer */
3442 int i = 0, j = 0; 3330 int i = 0, j = 0;
3443 3331
3444 /* get the appropriate treasurelist */ 3332 /* get the appropriate treasurelist */
3445 if (atnr == ATNR_FIRE) 3333 if (atnr == ATNR_FIRE)
3446 trlist = find_treasurelist ("dragon_ability_fire"); 3334 trlist = treasurelist::find ("dragon_ability_fire");
3447 else if (atnr == ATNR_COLD) 3335 else if (atnr == ATNR_COLD)
3448 trlist = find_treasurelist ("dragon_ability_cold"); 3336 trlist = treasurelist::find ("dragon_ability_cold");
3449 else if (atnr == ATNR_ELECTRICITY) 3337 else if (atnr == ATNR_ELECTRICITY)
3450 trlist = find_treasurelist ("dragon_ability_elec"); 3338 trlist = treasurelist::find ("dragon_ability_elec");
3451 else if (atnr == ATNR_POISON) 3339 else if (atnr == ATNR_POISON)
3452 trlist = find_treasurelist ("dragon_ability_poison"); 3340 trlist = treasurelist::find ("dragon_ability_poison");
3453 3341
3454 if (trlist == NULL || who->type != PLAYER) 3342 if (trlist == NULL || who->type != PLAYER)
3455 return; 3343 return;
3456 3344
3457 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3345 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3458 3346
3459 if (tr == NULL || tr->item == NULL) 3347 if (!tr || !tr->item)
3460 { 3348 {
3461 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3349 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3462 return; 3350 return;
3463 } 3351 }
3464 3352
… …
3589 * not readied. 3477 * not readied.
3590 */ 3478 */
3591void 3479void
3592player_unready_range_ob (player *pl, object *ob) 3480player_unready_range_ob (player *pl, object *ob)
3593{ 3481{
3594 rangetype i; 3482 if (pl->ob->current_weapon == ob)
3483 pl->ob->current_weapon = 0;
3595 3484
3596 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3485 if (pl->combat_ob == ob)
3597 { 3486 pl->combat_ob = 0;
3487
3598 if (pl->ranges[i] == ob) 3488 if (pl->ranged_ob == ob)
3599 { 3489 pl->ranged_ob = 0;
3600 pl->ranges[i] = NULL;
3601 if (pl->shoottype == i)
3602 {
3603 pl->shoottype = range_none;
3604 }
3605 }
3606 }
3607} 3490}
3491
3492sint8
3493player::visibility_at (maptile *map, int x, int y) const
3494{
3495 if (!ns)
3496 return 0;
3497
3498 int dx, dy;
3499 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3500 return 0;
3501
3502 x += dx - ns->current_x + ns->mapx / 2;
3503 y += dy - ns->current_y + ns->mapy / 2;
3504
3505 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3506 return 0;
3507
3508 return 100 - blocked_los [x][y];
3509}

Diff Legend

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