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.56 by root, Sat Dec 23 05:25:18 2006 UTC vs.
Revision 1.132 by root, Sat May 12 21:56:34 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 player *pl;
40
41 for (pl = first_player; pl; pl = pl->next)
42 if (pl->ob && !strcmp (query_name (pl->ob), plname))
43 return pl;
44
45 return 0;
46}
47 37
48void 38void
49display_motd (const object *op) 39display_motd (const object *op)
50{ 40{
51 char buf[MAX_BUF]; 41 char buf[MAX_BUF];
… …
125 115
126 news[0] = '\0'; 116 news[0] = '\0';
127 subject[0] = '\0'; 117 subject[0] = '\0';
128 size = 0; 118 size = 0;
129 119
130 while (fgets (buf, MAX_BUF, fp) != NULL) 120 while (fgets (buf, MAX_BUF, fp))
131 { 121 {
132 if (*buf == '#') 122 if (*buf == '#')
133 continue; 123 continue;
134 124
135 if (*buf == '%') 125 if (*buf == '%')
136 { /* send one news */ 126 { /* send one news */
137 if (size > 0) 127 if (size > 0)
138 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
139 strcpy (subject, buf + 1); 130 strcpy (subject, buf + 1);
140 strip_endline (subject); 131 strip_endline (subject);
141 size = 0; 132 size = 0;
142 news[0] = '\0'; 133 news[0] = '\0';
143 } 134 }
… …
152 size += strlen (buf); 143 size += strlen (buf);
153 } 144 }
154 } 145 }
155 146
156 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 147 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
157 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);
158 close_and_delete (fp, comp); 149 close_and_delete (fp, comp);
159} 150}
160 151
161/* This loads the first map an puts the player on it. */ 152/* This loads the first map an puts the player on it. */
162static void 153static void
163set_first_map (object *op) 154set_first_map (object *op)
164{ 155{
165 strcpy (op->contr->maplevel, first_map_path); 156 op->contr->maplevel = first_map_path;
166 op->x = -1; 157 op->x = -1;
167 op->y = -1; 158 op->y = -1;
159}
160
161void
162player::enter_map ()
163{
164 object *tmp = object::create ();
165
166 EXIT_PATH (tmp) = maplevel;
167 EXIT_X (tmp) = ob->x;
168 EXIT_Y (tmp) = ob->y;
168 enter_exit (op, 0); 169 ob->enter_exit (tmp);
170
171 tmp->destroy ();
172}
173
174void
175player::activate ()
176{
177 if (active)
178 return;
179
180 players.insert (this);
181 ob->remove ();
182 ob->map = 0;
183 ob->activate_recursive ();
184 CLEAR_FLAG (ob, FLAG_FRIENDLY);
185 add_friendly_object (ob);
186 enter_map ();
187}
188
189void
190player::deactivate ()
191{
192 if (!active)
193 return;
194
195 terminate_all_pets (ob);
196 remove_friendly_object (ob);
197 ob->deactivate_recursive ();
198
199 if (ob->map)
200 maplevel = ob->map->path;
201
202 ob->remove ();
203 ob->map = 0;
204 party = 0;
205
206 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
207
208 players.erase (this);
169} 209}
170 210
171// connect the player with a specific client 211// connect the player with a specific client
172// also changed, rationalises, and fixes some incorrect settings 212// also changes, rationalises, and fixes some incorrect settings
173void 213void
174player::connect (client *ns) 214player::connect (client *ns)
175{ 215{
176 this->ns = ns; 216 this->ns = ns;
177 ns->pl = this; 217 ns->pl = this;
178 218
179 next = first_player; 219 run_on = 0;
180 first_player = this; 220 fire_on = 0;
221 ob->close_container (); //TODO: client-specific
181 222
182 ns->update_look = 0; 223 ns->update_look = 0;
183 ns->look_position = 0; 224 ns->look_position = 0;
184 225
185 clear_los (ob); 226 clear_los (ob);
186 227
228 ns->reset_stats ();
229
230 /* make sure he's a player -- needed because of class change. */
187 ob->type = PLAYER; // we are paranoid 231 ob->type = PLAYER; // we are paranoid
188 ob->race = ob->arch->clone.race; 232 ob->race = ob->arch->clone.race;
189 233
190 if (!legal_range (ob, shoottype))
191 shoottype = range_none;
192
193 ob->carrying = sum_weight (ob); 234 ob->carrying = sum_weight (ob);
194 link_player_skills (ob); 235 link_player_skills (ob);
195 236
196 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 237 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
197 ob->update_stats ();
198 update_ob_speed (ob);
199 238
200 assign (title, ob->arch->clone.name); 239 assign (title, ob->arch->clone.name);
201
202 /* can_use_shield is a new flag. However, the can_use.. seems to largely come
203 * from the class, and not race. I don't see any way to get the class information
204 * to then update this. I don't think this will actually break anything - anyone
205 * that can use armour should be able to use a shield. What this may 'break'
206 * are features new characters get, eg, if someone starts up with a Q, they
207 * should be able to use a shield. However, old Q's won't get that advantage.
208 */
209 if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
210 SET_FLAG (ob, FLAG_USE_SHIELD);
211 240
212 /* if it's a dragon player, set the correct title here */ 241 /* if it's a dragon player, set the correct title here */
213 if (is_dragon_pl (ob)) 242 if (is_dragon_pl (ob))
214 { 243 {
215 object *tmp, *abil = 0, *skin = 0; 244 object *tmp, *abil = 0, *skin = 0;
… …
225 skin = tmp; 254 skin = tmp;
226 255
227 set_dragon_name (ob, abil, skin); 256 set_dragon_name (ob, abil, skin);
228 } 257 }
229 258
230 CLEAR_FLAG (ob, FLAG_FRIENDLY);
231 add_friendly_object (ob);
232
233 LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
234
235 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 259 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
236 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &ob->name);
237 260
261 esrv_new_player (this, ob->weight + ob->carrying);
262
263 for (object *op = ob->inv; op; op = op->below)
264 if (op->flag [FLAG_APPLIED])
265 switch (op->type)
266 {
267 case WAND:
268 case ROD:
269 case HORN:
270 case BOW:
271 case SKILL:
272 case SKILL_TOOL:
273 case WEAPON:
274 apply_special (ob, op, AP_UNAPPLY);
275 apply_special (ob, op, AP_APPLY);
276 break;
277 }
278
279 ob->update_stats ();
238 ns->floorbox_update (); 280 ns->floorbox_update ();
239 281
240 esrv_new_player (this, ob->weight + ob->carrying);
241 esrv_send_inventory (ob, ob); 282 esrv_send_inventory (ob, ob);
242 esrv_add_spells (this, 0); 283 esrv_add_spells (this, 0);
243 284
244 enter_exit (ob, 0); 285 activate ();
245 286
246// send_rules (ob);//TODO 287 send_rules (ob);
247// send_news (ob);//TODO 288 send_news (ob);
248// display_motd (ob);//TODO 289 display_motd (ob);
290
291 INVOKE_PLAYER (CONNECT, this);
249 INVOKE_PLAYER (LOGIN, this); 292 INVOKE_PLAYER (LOGIN, this);
293}
294
295void
296player::disconnect ()
297{
298 if (ns)
299 {
300 if (active)
301 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
302
303 INVOKE_PLAYER (DISCONNECT, this);
304
305 ns->reset_stats ();
306 ns->pl = 0;
307 ns = 0;
308 }
309
310 if (ob)
311 ob->close_container (); //TODO: client-specific
312
313 deactivate ();
250} 314}
251 315
252// the need for this function can be explained 316// the need for this function can be explained
253// by load_object not returning the object 317// by load_object not returning the object
254void 318void
255player::set_object (object *op) 319player::set_object (object *op)
256{ 320{
257 ob = op; 321 ob = op;
258 ob->contr = this; /* this aren't yet in archetype */ 322 ob->contr = this; /* this aren't yet in archetype */
259 323
260 ob->speed_left = 0.5; 324 ob->speed_left = 0.5;
261 ob->speed = 1.0; 325 ob->speed = 1.0;
262 ob->direction = 5; /* So player faces south */ 326 ob->direction = 5; /* So player faces south */
263 ob->stats.wc = 2;
264 ob->run_away = 25; /* Then we panick... */
265
266 set_first_map (ob);
267
268 ob->roll_stats ();
269} 327}
270 328
271player::player () 329player::player ()
272{ 330{
273 /* There are some elements we want initialized to non zero value - 331 /* There are some elements we want initialised to non zero value -
274 * we deal with that below this point. 332 * we deal with that below this point.
275 */ 333 */
276 outputs_sync = 16; /* Every 2 seconds */ 334 outputs_sync = 4;
277 outputs_count = 8; /* Keeps present behaviour */ 335 outputs_count = 4;
278 unapply = unapply_nochoice; 336 unapply = unapply_nochoice;
279 337
280 assign (savebed_map, first_map_path); /* Init. respawn position */ 338 savebed_map = first_map_path; /* Init. respawn position */
281 339
282 gen_sp_armour = 10; 340 gen_sp_armour = 10;
283 last_speed = -1;
284 shoottype = range_none;
285 bowtype = bow_normal; 341 bowtype = bow_normal;
286 petmode = pet_normal; 342 petmode = pet_normal;
287 listening = 10; 343 listening = 10;
288 usekeys = containers; 344 usekeys = containers;
289 last_weapon_sp = -1;
290 peaceful = 1; /* default peaceful */ 345 peaceful = 1; /* default peaceful */
291 do_los = 1; 346 do_los = 1;
347}
292 348
293 /* we need to clear these to -1 and not zero - otherwise, 349void
294 * if a player quits and starts a new character, we wont 350player::do_destroy ()
295 * send new values to the client, as things like exp start 351{
296 * at zero. 352 disconnect ();
297 */
298 for (int i = 0; i < NUM_SKILLS; i++)
299 last_skill_exp[i] = -1;
300 353
301 for (int i = 0; i < NROFATTACKS; i++) 354 attachable::do_destroy ();
302 last_resist[i] = -1;
303 355
304 last_stats.exp = -1; 356 if (ob)
305 last_weight = (uint32) - 1; 357 {
358 ob->destroy_inv (false);
359 ob->destroy ();
360 }
306} 361}
307 362
308player::~player () 363player::~player ()
309{ 364{
310 terminate_all_pets (ob);
311
312 if (first_player != this)
313 {
314 player *prev = first_player;
315
316 while (prev && prev->next && prev->next != this)
317 prev = prev->next;
318
319 if (prev->next != this)
320 {
321 LOG (llevError, "Free_player: Can't find previous player.\n");
322 abort ();
323 }
324
325 prev->next = next;
326 }
327 else
328 first_player = next;
329
330 if (ob)
331 {
332 ob->contr = 0;
333 ob->destroy (1);
334 }
335
336 if (ns)
337 {
338 ns->send_packet ("goodbye");
339 ns->flush ();
340 ns->pl = 0;
341 ns->destroy ();
342 }
343
344 /* Clear item stack */ 365 /* Clear item stack */
345 free (stack_items); 366 free (stack_items);
346} 367}
347 368
348/* Tries to add player on the connection passed in ns. 369/* Tries to add player on the connection passed in ns.
… …
353player::create () 374player::create ()
354{ 375{
355 player *pl = new player; 376 player *pl = new player;
356 377
357 pl->set_object (arch_to_object (get_player_archetype (0))); 378 pl->set_object (arch_to_object (get_player_archetype (0)));
379
380 pl->ob->roll_stats ();
381 pl->ob->stats.wc = 2;
382 pl->ob->run_away = 25; /* Then we panick... */
383
384 set_first_map (pl->ob);
358 385
359 return pl; 386 return pl;
360} 387}
361 388
362/* 389/*
… …
389 416
390object * 417object *
391get_nearest_player (object *mon) 418get_nearest_player (object *mon)
392{ 419{
393 object *op = NULL; 420 object *op = NULL;
394 player *pl = NULL;
395 objectlink *ol; 421 objectlink *ol;
396 unsigned lastdist; 422 unsigned lastdist;
397 rv_vector rv; 423 rv_vector rv;
398 424
399 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 425 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
400 { 426 {
401 /* We should not find free objects on this friendly list, but it 427 /* We should not find free objects on this friendly list, but it
402 * does periodically happen. Given that, lets deal with it. 428 * does periodically happen. Given that, lets deal with it.
403 * While unlikely, it is possible the next object on the friendly 429 * While unlikely, it is possible the next object on the friendly
404 * list is also free, so encapsulate this in a while loop. 430 * list is also free, so encapsulate this in a while loop.
… …
408 object *tmp = ol->ob; 434 object *tmp = ol->ob;
409 435
410 /* Can't do much more other than log the fact, because the object 436 /* Can't do much more other than log the fact, because the object
411 * itself will have been cleared. 437 * itself will have been cleared.
412 */ 438 */
413 LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n"); 439 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
440 tmp->debug_desc ());
414 ol = ol->next; 441 ol = ol->next;
415 remove_friendly_object (tmp); 442 remove_friendly_object (tmp);
416 if (!ol) 443 if (!ol)
417 return op; 444 return op;
418 } 445 }
… …
431 { 458 {
432 op = ol->ob; 459 op = ol->ob;
433 lastdist = rv.distance; 460 lastdist = rv.distance;
434 } 461 }
435 } 462 }
436 for (pl = first_player; pl != NULL; pl = pl->next) 463
437 { 464 for_all_players (pl)
438 if (can_detect_enemy (mon, pl->ob, &rv)) 465 if (can_detect_enemy (mon, pl->ob, &rv))
439 {
440
441 if (lastdist > rv.distance) 466 if (lastdist > rv.distance)
442 { 467 {
443 op = pl->ob; 468 op = pl->ob;
444 lastdist = rv.distance; 469 lastdist = rv.distance;
445 } 470 }
446 } 471
447 }
448#if 0 472#if 0
449 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)"); 473 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");
450#endif 474#endif
451 return op; 475 return op;
452} 476}
… …
510 x = mon->x; 534 x = mon->x;
511 y = mon->y; 535 y = mon->y;
512 m = mon->map; 536 m = mon->map;
513 dir = rv.direction; 537 dir = rv.direction;
514 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 538 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
515 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 539 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
540
516 /* If we can't solve it within the search distance, return now. */ 541 /* If we can't solve it within the search distance, return now. */
517 if (diff > max) 542 if (diff > max)
518 return 0; 543 return 0;
544
519 while (diff > 1 && max > 0) 545 while (diff > 1 && max > 0)
520 { 546 {
521 lastx = x; 547 lastx = x;
522 lasty = y; 548 lasty = y;
523 lastmap = m; 549 lastmap = m;
… …
605 max--; 631 max--;
606 lastdir = dir; 632 lastdir = dir;
607 if (!firstdir) 633 if (!firstdir)
608 firstdir = dir; 634 firstdir = dir;
609 } 635 }
636
610 if (diff <= 1) 637 if (diff <= 1)
611 { 638 {
612 /* Recalculate diff (distance) because we may not have actually 639 /* Recalculate diff (distance) because we may not have actually
613 * headed toward player for entire distance. 640 * headed toward player for entire distance.
614 */ 641 */
615 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 642 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
616 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 643 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
617 } 644 }
645
618 if (diff > max) 646 if (diff > max)
619 return 0; 647 return 0;
620 } 648 }
649
621 /* If we reached the max, didn't find a direction in time */ 650 /* If we reached the max, didn't find a direction in time */
622 if (!max) 651 if (!max)
623 return 0; 652 return 0;
624 653
625 return firstdir; 654 return firstdir;
… …
739roll_stat (void) 768roll_stat (void)
740{ 769{
741 int a[4], i, j, k; 770 int a[4], i, j, k;
742 771
743 for (i = 0; i < 4; i++) 772 for (i = 0; i < 4; i++)
744 a[i] = (int) RANDOM () % 6 + 1; 773 a[i] = (int) rndm (6) + 1;
745 774
746 for (i = 0, j = 0, k = 7; i < 4; i++) 775 for (i = 0, j = 0, k = 7; i < 4; i++)
747 if (a[i] < k) 776 if (a[i] < k)
748 k = a[i], j = i; 777 k = a[i], j = i;
749 778
… …
755} 784}
756 785
757void 786void
758object::roll_stats () 787object::roll_stats ()
759{ 788{
760 int statsort [7]; 789 int statsort [NUM_STATS];
761 790
762 for (;;) 791 for (;;)
763 { 792 {
764 int sum = 0; 793 int sum = 0;
765 for (int i = 7; i--; ) 794 for (int i = NUM_STATS; i--; )
766 sum += statsort [i] = roll_stat (); 795 sum += statsort [i] = roll_stat ();
767 796
768 if (sum >= 82 && sum <= 116) 797 if (sum >= 82 && sum <= 116)
769 break; 798 break;
770 } 799 }
771 800
772 // Sort the stats so that rerolling is easier... 801 // Sort the stats so that rerolling is easier...
773 std::sort (statsort, statsort + 7, std::greater<int>()); 802 std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
774 803
804 for (int i = 0; i < NUM_STATS; ++i)
775 stats.Str = statsort[0]; 805 stats.stat (i) = statsort [i];
776 stats.Dex = statsort[1];
777 stats.Con = statsort[2];
778 stats.Int = statsort[3];
779 stats.Wis = statsort[4];
780 stats.Pow = statsort[5];
781 stats.Cha = statsort[6];
782 806
783 stats.exp = 0; 807 stats.exp = 0;
784 stats.ac = 0; 808 stats.ac = 0;
785 809
786 stats.hp = stats.maxhp; 810 stats.hp = stats.maxhp;
… …
798} 822}
799 823
800void 824void
801object::swap_stats (int a, int b) 825object::swap_stats (int a, int b)
802{ 826{
803 int tmp = get_attr_value (&contr->orig_stats, a); 827 swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
804 set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
805 set_attr_value (&contr->orig_stats, b, tmp);
806 828
829 for (int i = 0; i < NUM_STATS; ++i)
807 stats.Str = contr->orig_stats.Str; 830 stats.stat (i) = contr->orig_stats.stat (i);
808 stats.Dex = contr->orig_stats.Dex;
809 stats.Con = contr->orig_stats.Con;
810 stats.Int = contr->orig_stats.Int;
811 stats.Wis = contr->orig_stats.Wis;
812 stats.Pow = contr->orig_stats.Pow;
813 stats.Cha = contr->orig_stats.Cha;
814 831
815 //TODO: the following code looks so borked and should, at the very least, 832 //TODO: the following code looks so borked and should, at the very least,
816 // be merged with the similar code in roll_stats 833 // be merged with the similar code in roll_stats
817 stats.ac = 0; 834 stats.ac = 0;
818 835
… …
830 contr->levsp[1] = 6; 847 contr->levsp[1] = 6;
831 contr->levgrace[1] = 3; 848 contr->levgrace[1] = 3;
832 849
833 contr->orig_stats = stats; 850 contr->orig_stats = stats;
834 } 851 }
852}
853
854static void
855start_info (object *op)
856{
857 char buf[MAX_BUF];
858
859 sprintf (buf, "Welcome to Crossfire v%s!", VERSION);
860 new_draw_info (NDI_UNIQUE, 0, op, buf);
861 //new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
862 //new_draw_info (NDI_UNIQUE, 0, op, " ");
835} 863}
836 864
837/* This function takes the key that is passed, and does the 865/* This function takes the key that is passed, and does the
838 * appropriate action with it (change race, or other things). 866 * appropriate action with it (change race, or other things).
839 * The function name is for historical reasons - now we have 867 * The function name is for historical reasons - now we have
840 * separate race and class; this actually changes the RACE, 868 * separate race and class; this actually changes the RACE,
841 * not the class. 869 * not the class.
842 */ 870 */
843int 871void
844key_change_class (object *op, char key) 872player::chargen_race_done ()
845{ 873{
846 int tmp_loop;
847
848 if (key == 'd' || key == 'D')
849 {
850 char buf[MAX_BUF];
851
852 /* this must before then initial items are given */ 874 /* this must before then initial items are given */
853 esrv_new_player (op->contr, op->weight + op->carrying); 875 esrv_new_player (ob->contr, ob->weight + ob->carrying);
854 876
855 treasurelist *tl = find_treasurelist ("starting_wealth"); 877 treasurelist *tl = treasurelist::find ("starting_wealth");
856 if (tl) 878 if (tl)
857 create_treasure (tl, op, 0, 0, 0); 879 create_treasure (tl, ob, 0, 0, 0);
858 880
859 INVOKE_PLAYER (BIRTH, op->contr); 881 INVOKE_PLAYER (BIRTH, ob->contr);
860 INVOKE_PLAYER (LOGIN, op->contr); 882 INVOKE_PLAYER (LOGIN, ob->contr);
861 883
862 op->contr->ns->state = ST_PLAYING; 884 ob->contr->ns->state = ST_PLAYING;
863 885
864 if (op->msg) 886 if (ob->msg)
865 op->msg = NULL; 887 ob->msg = 0;
866 888
867 /* We create this now because some of the unique maps will need it 889 /* We create this now because some of the unique maps will need it
868 * to save here. 890 * to save here.
869 */ 891 */
892 {
893 char buf[MAX_BUF];
870 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 894 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
871 make_path_to_file (buf); 895 make_path_to_file (buf);
896 }
872 897
873#ifdef AUTOSAVE
874 op->contr->last_save_tick = pticks;
875#endif
876 start_info (op); 898 start_info (ob);
877 CLEAR_FLAG (op, FLAG_WIZ); 899 CLEAR_FLAG (ob, FLAG_WIZ);
878 give_initial_items (op, op->randomitems); 900 give_initial_items (ob, ob->randomitems);
879 link_player_skills (op); 901 link_player_skills (ob);
880 esrv_send_inventory (op, op); 902 esrv_send_inventory (ob, ob);
881 op->update_stats (); 903 ob->update_stats ();
882 904
883 /* This moves the player to a different start map, if there 905 /* This moves the player to a different start map, if there
884 * is one for this race 906 * is one for this race
885 */ 907 */
886 if (*first_map_ext_path) 908 if (*first_map_ext_path)
887 { 909 {
888 object *tmp; 910 object *tmp;
889 char mapname[MAX_BUF]; 911 char mapname[MAX_BUF];
890 912
891 snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name); 913 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
892 tmp = object::create (); 914 tmp = object::create ();
893 EXIT_PATH (tmp) = mapname; 915 EXIT_PATH (tmp) = mapname;
894 EXIT_X (tmp) = op->x; 916 EXIT_X (tmp) = ob->x;
895 EXIT_Y (tmp) = op->y; 917 EXIT_Y (tmp) = ob->y;
896 enter_exit (op, tmp); /* we don't really care if it succeeded; 918 ob->enter_exit (tmp); /* we don't really care if it succeeded;
897 * if the map isn't there, then stay on the 919 * if the map isn't there, then stay on the
898 * default initial map */ 920 * default initial map */
899 tmp->destroy (); 921 tmp->destroy ();
900 } 922 }
901 else 923 else
902 LOG (llevDebug, "first_map_ext_path not set\n"); 924 LOG (llevDebug, "first_map_ext_path not set\n");
925}
903 926
904 return 0; 927void
905 } 928player::chargen_race_next ()
906 929{
907 /* Following actually changes the race - this is the default command 930 /* Following actually changes the race - this is the default command
908 * if we don't match with one of the options above. 931 * if we don't match with one of the options above.
909 */ 932 */
910 933
911 tmp_loop = 0; 934 do
912 while (!tmp_loop)
913 { 935 {
914 shstr name = op->name; 936 shstr name = ob->name;
915 int x = op->x, y = op->y; 937 int x = ob->x, y = ob->y;
916 938
917 op->remove_statbonus (); 939 ob->remove_statbonus ();
918 op->remove (); 940 ob->remove ();
919 op->arch = get_player_archetype (op->arch); 941 ob->arch = get_player_archetype (ob->arch);
920 op->arch->clone.copy_to (op); 942 ob->arch->clone.copy_to (ob);
921 op->instantiate (); 943 ob->instantiate ();
922 op->stats = op->contr->orig_stats; 944 ob->stats = ob->contr->orig_stats;
923 op->name = op->name_pl = name; 945 ob->name = ob->name_pl = name;
924 op->x = x; 946 ob->x = x;
925 op->y = y; 947 ob->y = y;
926 SET_ANIMATION (op, 2); /* So player faces south */ 948 SET_ANIMATION (ob, 2); /* So player faces south */
927 insert_ob_in_map (op, op->map, op, 0); 949 insert_ob_in_map (ob, ob->map, ob, 0);
928 assign (op->contr->title, op->arch->clone.name); 950 assign (ob->contr->title, ob->arch->clone.name);
929 op->add_statbonus (); 951 ob->add_statbonus ();
930 tmp_loop = allowed_class (op);
931 } 952 }
953 while (!allowed_class (ob));
932 954
933 update_object (op, UP_OBJ_FACE); 955 update_object (ob, UP_OBJ_FACE);
934 esrv_update_item (UPD_FACE, op, op); 956 esrv_update_item (UPD_FACE, ob, ob);
935 op->update_stats (); 957 ob->update_stats ();
936 op->stats.hp = op->stats.maxhp; 958 ob->stats.hp = ob->stats.maxhp;
937 op->stats.sp = op->stats.maxsp; 959 ob->stats.sp = ob->stats.maxsp;
938 op->stats.grace = 0; 960 ob->stats.grace = 0;
939
940 if (op->msg)
941 new_draw_info (NDI_BLUE, 0, op, op->msg);
942
943 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
944 return 0;
945}
946
947int
948key_confirm_quit (object *op, char key)
949{
950 if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
951 {
952 op->contr->ns->state = ST_PLAYING;
953 new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
954 return 1;
955 }
956
957 INVOKE_PLAYER (LOGOUT, op->contr);
958 INVOKE_PLAYER (QUIT, op->contr);
959
960 terminate_all_pets (op);
961 leave_map (op);
962 op->direction = 0;
963 new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
964
965 strcpy (op->contr->killer, "quit");
966 check_score (op);
967 op->contr->party = 0;
968 op->contr->own_title[0] = '\0';
969
970 object_ptr ob = op;
971
972 delete ob->contr;
973
974 /* We need to hunt for any per player unique maps in memory and
975 * get rid of them. The trailing slash in the path is intentional,
976 * so that players named 'Ab' won't match against players 'Abe' pathname
977 */
978 char buf[MAX_BUF];
979 sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
980
981 for (maptile *next, *mp = first_map; mp; mp = next)
982 {
983 next = mp->next;
984
985 if (!strncmp (mp->path, buf, strlen (buf)))
986 delete_map (mp);
987 }
988
989 delete_character (ob->name, 1);
990
991 return 1;
992} 961}
993 962
994void 963void
995flee_player (object *op) 964flee_player (object *op)
996{ 965{
… …
1043 /* Cornered, get rid of scared */ 1012 /* Cornered, get rid of scared */
1044 CLEAR_FLAG (op, FLAG_SCARED); 1013 CLEAR_FLAG (op, FLAG_SCARED);
1045 op->enemy = NULL; 1014 op->enemy = NULL;
1046} 1015}
1047 1016
1048
1049/* check_pick sees if there is stuff to be picked up/picks up stuff. 1017/* check_pick sees if there is stuff to be picked up/picks up stuff.
1050 * IT returns 1 if the player should keep on moving, 0 if he should 1018 * It returns 1 if the player should keep on moving, 0 if he should
1051 * stop. 1019 * stop.
1052 */ 1020 */
1053int 1021int
1054check_pick (object *op) 1022check_pick (object *op)
1055{ 1023{
1056 object *tmp, *next; 1024 object *tmp, *next;
1057 int stop = 0; 1025 int stop = 0;
1058 int j, k, wvratio; 1026 int wvratio;
1059 char putstring[128], tmpstr[16]; 1027 char putstring[128];
1060 1028
1061 /* if you're flying, you cna't pick up anything */ 1029 /* if you're flying, you cna't pick up anything */
1062 if (op->move_type & MOVE_FLYING) 1030 if (op->move_type & MOVE_FLYING)
1063 return 1; 1031 return 1;
1064 1032
… …
1133 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1101 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1134 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1102 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1135 else 1103 else
1136 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1104 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1137 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1105 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1106
1138 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1107 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1139
1140 sprintf (putstring, "...flags: ");
1141 for (k = 0; k < 4; k++)
1142 {
1143 for (j = 0; j < 32; j++)
1144 {
1145 if ((tmp->flags[k] >> j) & 0x01)
1146 {
1147 sprintf (tmpstr, "%d ", k * 32 + j);
1148 strcat (putstring, tmpstr);
1149 }
1150 }
1151 }
1152 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1153
1154#if 0
1155 /* print the flags too */
1156 for (k = 0; k < 4; k++)
1157 {
1158 fprintf (stderr, "%d [%d] ", k, k * 32 + 31);
1159 for (j = 0; j < 32; j++)
1160 {
1161 fprintf (stderr, "%d", tmp->flags[k] >> (31 - j) & 0x01);
1162 if (!((j + 1) % 4))
1163 fprintf (stderr, " ");
1164 }
1165 fprintf (stderr, " [%d]\n", k * 32);
1166 }
1167#endif
1168 } 1108 }
1109
1169 /* philosophy: 1110 /* philosophy:
1170 * It's easy to grab an item type from a pile, as long as it's 1111 * It's easy to grab an item type from a pile, as long as it's
1171 * generic. This takes no game-time. For more detailed pickups 1112 * generic. This takes no game-time. For more detailed pickups
1172 * and selections, select-items shoul dbe used. This is a 1113 * and selections, select-items should be used. This is a
1173 * grab-as-you-run type mode that's really useful for arrows for 1114 * grab-as-you-run type mode that's really useful for arrows for
1174 * example. 1115 * example.
1175 * The drawback: right now it has no frontend, so you need to 1116 * The drawback: right now it has no frontend, so you need to
1176 * stick the bits you want into a calculator in hex mode and then 1117 * stick the bits you want into a calculator in hex mode and then
1177 * convert to decimal and then 'pickup <#> 1118 * convert to decimal and then 'pickup <#>
… …
1428 * found object is returned. 1369 * found object is returned.
1429 */ 1370 */
1430object * 1371object *
1431find_arrow (object *op, const char *type) 1372find_arrow (object *op, const char *type)
1432{ 1373{
1433 object *tmp = NULL; 1374 object *tmp = 0;
1434 1375
1435 for (op = op->inv; op; op = op->below) 1376 for (op = op->inv; op; op = op->below)
1436 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) 1377 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1437 tmp = find_arrow (op, type); 1378 tmp = find_arrow (op, type);
1438 else if (op->type == ARROW && op->race == type) 1379 else if (op->type == ARROW && op->race == type)
1439 return op; 1380 return op;
1381
1440 return tmp; 1382 return tmp;
1441} 1383}
1442 1384
1443/* 1385/*
1444 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1386 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1445 * against the target. A full test is not performed, simply a basic test 1387 * against the target. A full test is not performed, simply a basic test
1446 * of resistances. The archer is making a quick guess at what he sees down 1388 * of resistances. The archer is making a quick guess at what he sees down
1447 * the hall. Failing that it does it's best to pick the highest plus arrow. 1389 * the hall. Failing that it does it's best to pick the highest plus arrow.
1448 */ 1390 */
1449
1450object * 1391object *
1451find_better_arrow (object *op, object *target, const char *type, int *better) 1392find_better_arrow (object *op, object *target, const char *type, int *better)
1452{ 1393{
1453 object *tmp = NULL, *arrow, *ntmp; 1394 object *tmp = NULL, *arrow, *ntmp;
1454 int attacknum, attacktype, betterby = 0, i; 1395 int attacknum, attacktype, betterby = 0, i;
… …
1520 * find_better_arrow to find a decent arrow to use. 1461 * find_better_arrow to find a decent arrow to use.
1521 * op = the shooter 1462 * op = the shooter
1522 * type = bow->race 1463 * type = bow->race
1523 * dir = fire direction 1464 * dir = fire direction
1524 */ 1465 */
1525
1526object * 1466object *
1527pick_arrow_target (object *op, const char *type, int dir) 1467pick_arrow_target (object *op, const char *type, int dir)
1528{ 1468{
1529 object *tmp = NULL; 1469 object *tmp = NULL;
1530 maptile *m; 1470 maptile *m;
… …
1595 */ 1535 */
1596int 1536int
1597fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy) 1537fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1598{ 1538{
1599 object *left, *bow; 1539 object *left, *bow;
1600 int bowspeed, mflags; 1540 int mflags;
1601 maptile *m; 1541 maptile *m;
1602 1542
1603 if (!dir) 1543 if (!dir)
1604 { 1544 {
1605 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1545 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1606 return 0; 1546 return 0;
1607 } 1547 }
1608 1548
1609 if (op->type == PLAYER) 1549 if (player *pl = op->contr)
1610 bow = op->contr->ranges[range_bow]; 1550 {
1551 bow = pl->ranged_ob;
1552 if (!op->change_weapon (bow))
1553 return 0;
1554 }
1611 else 1555 else
1612 { 1556 {
1613 for (bow = op->inv; bow; bow = bow->below) 1557 for (bow = op->inv; bow; bow = bow->below)
1614 /* Don't check for applied - monsters don't apply bows - in that way, they 1558 /* Don't check for applied - monsters don't apply bows - in that way, they
1615 * don't need to switch back and forth between bows and weapons. 1559 * don't need to switch back and forth between bows and weapons.
… …
1620 if (!bow) 1564 if (!bow)
1621 { 1565 {
1622 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1566 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1623 return 0; 1567 return 0;
1624 } 1568 }
1569
1570 // optimisation: move object to top so we will find it quickly again
1571 if (bow->below)
1572 {
1573 bow->remove ();
1574 op->insert (bow);
1575 }
1576
1625 } 1577 }
1626 1578
1627 if (!bow->race || !bow->skill) 1579 if (!bow->race || !bow->skill)
1628 { 1580 {
1629 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1581 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1630 return 0; 1582 return 0;
1631 } 1583 }
1632
1633 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1634
1635 /* penalize ROF for bestarrow */
1636 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1637 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1638
1639 if (bowspeed < 1)
1640 bowspeed = 1;
1641 1584
1642 if (arrow == NULL) 1585 if (arrow == NULL)
1643 { 1586 {
1644 if ((arrow = find_arrow (op, bow->race)) == NULL) 1587 if ((arrow = find_arrow (op, bow->race)) == NULL)
1645 { 1588 {
1646 if (op->type == PLAYER) 1589 if (op->type == PLAYER)
1647 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1590 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1648 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1591 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1649 else 1592 else
1650 CLEAR_FLAG (op, FLAG_READY_BOW); 1593 CLEAR_FLAG (op, FLAG_READY_BOW);
1594
1651 return 0; 1595 return 0;
1652 } 1596 }
1653 } 1597 }
1654 1598
1655 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1599 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
… …
1677 return 0; 1621 return 0;
1678 } 1622 }
1679 1623
1680 arrow->set_owner (op); 1624 arrow->set_owner (op);
1681 arrow->skill = bow->skill; 1625 arrow->skill = bow->skill;
1682
1683 arrow->direction = dir; 1626 arrow->direction = dir;
1684 arrow->x = sx; 1627
1685 arrow->y = sy; 1628 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1629 arrow->stats.hp = arrow->stats.dam;
1630 arrow->stats.grace = arrow->attacktype;
1631
1632 if (arrow->slaying)
1633 arrow->spellarg = strdup (arrow->slaying);
1634
1635 if (player *pl = op->contr)
1636 {
1637 pl->has_hit = 1;
1638#if 0
1639 float speed = pl->weapon_sp;
1640
1641 /* penalize ROF for bestarrow */
1642 if (pl->bowtype == bow_bestarrow)
1643 speed *= .9f;
1644 else
1645 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1646
1647 op->speed_left += speed - op->speed;
1648#endif
1649 }
1650
1651 SET_ANIMATION (arrow, arrow->direction);
1652
1653 /* update the speed */
1654 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0
1655 + bow->stats.dam / 7.0;
1656
1657 arrow->set_speed (max (arrow->speed, 2.0));
1658 arrow->speed_left = 0;
1659
1660 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1686 1661
1687 if (op->type == PLAYER) 1662 if (op->type == PLAYER)
1688 { 1663 {
1689 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1690 op->update_stats ();
1691 }
1692
1693 SET_ANIMATION (arrow, arrow->direction);
1694 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1695 arrow->stats.hp = arrow->stats.dam;
1696 arrow->stats.grace = arrow->attacktype;
1697 if (arrow->slaying != NULL)
1698 arrow->spellarg = strdup (arrow->slaying);
1699
1700 /* Note that this was different for monsters - they got their level
1701 * added to the damage. I think the strength bonus is more proper.
1702 */
1703
1704 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1705
1706 /* update the speed */
1707 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1708 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1709
1710 if (arrow->speed < 1.0)
1711 arrow->speed = 1.0;
1712 update_ob_speed (arrow);
1713 arrow->speed_left = 0;
1714
1715 if (op->type == PLAYER)
1716 {
1717 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1718 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1719 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1720
1721 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1664 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1665 wc -= dex_bonus[op->stats.Dex];
1666
1667 if (!arrow->slaying)
1668 arrow->slaying = op->slaying;
1669
1670 arrow->attacktype |= op->attacktype;
1722 } 1671 }
1723 else 1672 else
1724 { 1673 {
1725 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1726 arrow->level = op->level; 1674 arrow->level = op->level;
1727 } 1675 arrow->stats.wc -= bow->magic;
1728 1676
1729 if (arrow->attacktype == AT_PHYSICAL) 1677 if (!arrow->slaying)
1678 arrow->slaying = bow->slaying;
1679
1730 arrow->attacktype |= bow->attacktype; 1680 arrow->attacktype |= bow->attacktype;
1681 }
1731 1682
1732 if (bow->slaying) 1683 wc -= arrow->level;
1733 arrow->slaying = bow->slaying; 1684 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1734 1685
1735 arrow->map = m; 1686 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1736 arrow->move_type = MOVE_FLY_LOW; 1687 arrow->move_type = MOVE_FLY_LOW;
1737 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1688 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1738 1689
1739 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1690 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1740 insert_ob_in_map (arrow, m, op, 0); 1691 m->insert (arrow, sx, sy, op);
1741 1692
1742 if (!arrow->destroyed ()) 1693 if (!arrow->destroyed ())
1743 move_arrow (arrow); 1694 move_arrow (arrow);
1744 1695
1745 if (op->type == PLAYER) 1696 if (op->type == PLAYER)
… …
1765{ 1716{
1766 int ret = 0, wcmod = 0; 1717 int ret = 0, wcmod = 0;
1767 1718
1768 if (op->contr->bowtype == bow_bestarrow) 1719 if (op->contr->bowtype == bow_bestarrow)
1769 { 1720 {
1770 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1721 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1771 } 1722 }
1772 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1723 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1773 { 1724 {
1774 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1725 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1775 wcmod = -1; 1726 wcmod = -1;
1727
1776 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); 1728 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1777 } 1729 }
1778 else if (op->contr->bowtype == bow_threewide) 1730 else if (op->contr->bowtype == bow_threewide)
1779 { 1731 {
1780 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);
… …
1784 else if (op->contr->bowtype == bow_spreadshot) 1736 else if (op->contr->bowtype == bow_spreadshot)
1785 { 1737 {
1786 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1738 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1787 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1739 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1788 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1740 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1789
1790 } 1741 }
1791 else 1742 else
1792 { 1743 {
1793 /* Simple case */ 1744 /* Simple case */
1794 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1745 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1795 } 1746 }
1747
1796 return ret; 1748 return ret;
1797} 1749}
1798 1750
1799 1751
1800/* Fires a misc (wand/rod/horn) object in 'dir'. 1752/* Fires a misc (wand/rod/horn) object in 'dir'.
1801 * Broken apart from 'fire' to keep it more readable. 1753 * Broken apart from 'fire' to keep it more readable.
1802 */ 1754 */
1803void 1755void
1804fire_misc_object (object *op, int dir) 1756fire_misc_object (object *op, int dir)
1805{ 1757{
1806 object *item; 1758 object *item = op->contr->ranged_ob;
1807 1759
1808 if (!op->contr->ranges[range_misc]) 1760 if (!item)
1809 { 1761 {
1810 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); 1762 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1811 return; 1763 return;
1812 } 1764 }
1813 1765
1814 item = op->contr->ranges[range_misc];
1815 if (!item->inv) 1766 if (!item->inv)
1816 { 1767 {
1817 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1768 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1818 return; 1769 return;
1819 } 1770 }
1771
1772 if (!op->change_weapon (item))
1773 return;
1774
1820 if (item->type == WAND) 1775 if (item->type == WAND)
1821 { 1776 {
1822 if (item->stats.food <= 0) 1777 if (item->stats.food <= 0)
1823 { 1778 {
1824 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1779 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1825 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1780 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1781
1826 return; 1782 return;
1827 } 1783 }
1828 } 1784 }
1829 else if (item->type == ROD || item->type == HORN) 1785 else if (item->type == ROD || item->type == HORN)
1830 { 1786 {
1831 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1787 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1832 { 1788 {
1833 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1789 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1790
1834 if (item->type == ROD) 1791 if (item->type == ROD)
1835 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1792 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1836 else 1793 else
1837 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1794 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1795
1838 return; 1796 return;
1839 } 1797 }
1840 } 1798 }
1841 1799
1842 if (cast_spell (op, item, dir, item->inv, NULL)) 1800 if (cast_spell (op, item, dir, item->inv, NULL))
… …
1850 1808
1851 if (item->arch) 1809 if (item->arch)
1852 { 1810 {
1853 CLEAR_FLAG (item, FLAG_ANIMATE); 1811 CLEAR_FLAG (item, FLAG_ANIMATE);
1854 item->face = item->arch->clone.face; 1812 item->face = item->arch->clone.face;
1855 item->speed = 0; 1813 item->set_speed (0);
1856 update_ob_speed (item);
1857 } 1814 }
1815
1858 if ((tmp = item->in_player ())) 1816 if ((tmp = item->in_player ()))
1859 esrv_update_item (UPD_ANIM, tmp, item); 1817 esrv_update_item (UPD_ANIM, tmp, item);
1860 } 1818 }
1861 } 1819 }
1862 else if (item->type == ROD || item->type == HORN) 1820 else if (item->type == ROD || item->type == HORN)
1863 {
1864 drain_rod_charge (item); 1821 drain_rod_charge (item);
1865 }
1866 } 1822 }
1867} 1823}
1868 1824
1869/* Received a fire command for the player - go and do it. 1825/* Received a fire command for the player - go and do it.
1870 */ 1826 */
… …
1875 1831
1876 /* check for loss of invisiblity/hide */ 1832 /* check for loss of invisiblity/hide */
1877 if (action_makes_visible (op)) 1833 if (action_makes_visible (op))
1878 make_visible (op); 1834 make_visible (op);
1879 1835
1880 switch (op->contr->shoottype) 1836 player *pl = op->contr;
1837
1838 if (pl->golem)
1881 { 1839 {
1882 case range_none: 1840 control_golem (op->contr->golem, dir);
1883 return; 1841 return;
1842 }
1884 1843
1885 case range_bow: 1844 object *ob = pl->ranged_ob;
1845
1846 if (!ob)
1847 return;
1848
1849 switch (ob->type)
1850 {
1851 case BOW:
1886 player_fire_bow (op, dir); 1852 player_fire_bow (op, dir);
1887 return; 1853 break;
1888 1854
1889 case range_magic: /* Casting spells */ 1855 case SPELL:
1890 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1856 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1891 return; 1857 break;
1892 1858
1893 case range_misc: 1859 case BUILDER:
1860 apply_map_builder (op, dir);
1861 break;
1862
1863 case SKILL:
1864 case SKILL_TOOL:
1865 do_skill (op, op, ob, dir, 0);
1866 break;
1867
1868 default:
1894 fire_misc_object (op, dir); 1869 fire_misc_object (op, dir);
1895 return; 1870 break;
1896
1897 case range_golem: /* Control summoned monsters from scrolls */
1898 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1899 {
1900 op->contr->ranges[range_golem] = 0;
1901 op->contr->shoottype = range_none;
1902 }
1903 else
1904 control_golem (op->contr->ranges[range_golem], dir);
1905 return;
1906
1907 case range_skill:
1908 if (!op->chosen_skill)
1909 {
1910 if (op->type == PLAYER)
1911 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1912 return;
1913 }
1914 (void) do_skill (op, op, op->chosen_skill, dir, NULL);
1915 return;
1916 case range_builder:
1917 apply_map_builder (op, dir);
1918 return;
1919 default:
1920 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1921 return;
1922 } 1871 }
1923} 1872}
1924
1925
1926 1873
1927/* find_key 1874/* find_key
1928 * We try to find a key for the door as passed. If we find a key 1875 * We try to find a key for the door as passed. If we find a key
1929 * and successfully use it, we return the key, otherwise NULL 1876 * and successfully use it, we return the key, otherwise NULL
1930 * This function merges both normal and locked door, since the logic 1877 * This function merges both normal and locked door, since the logic
… …
1932 * pl is the player, 1879 * pl is the player,
1933 * inv is the objects inventory to searched 1880 * inv is the objects inventory to searched
1934 * door is the door we are trying to match against. 1881 * door is the door we are trying to match against.
1935 * This function can be called recursively to search containers. 1882 * This function can be called recursively to search containers.
1936 */ 1883 */
1937
1938object * 1884object *
1939find_key (object *pl, object *container, object *door) 1885find_key (object *pl, object *container, object *door)
1940{ 1886{
1941 object *tmp, *key; 1887 object *tmp, *key;
1942 1888
1943 /* Should not happen, but sanity checking is never bad */ 1889 /* Should not happen, but sanity checking is never bad */
1944 if (container->inv == NULL) 1890 if (!container->inv)
1945 return NULL; 1891 return 0;
1946 1892
1947 /* First, lets try to find a key in the top level inventory */ 1893 /* First, lets try to find a key in the top level inventory */
1948 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1894 for (tmp = container->inv; tmp; tmp = tmp->below)
1949 { 1895 {
1950 if (door->type == DOOR && tmp->type == KEY) 1896 if (door->type == DOOR && tmp->type == KEY)
1951 break; 1897 break;
1952 /* For sanity, we should really check door type, but other stuff 1898 /* For sanity, we should really check door type, but other stuff
1953 * (like containers) can be locked with special keys 1899 * (like containers) can be locked with special keys
1954 */ 1900 */
1955 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1901 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1956 break; 1902 break;
1957 } 1903 }
1904
1958 /* No key found - lets search inventories now */ 1905 /* No key found - lets search inventories now */
1959 /* If we find and use a key in an inventory, return at that time. 1906 /* If we find and use a key in an inventory, return at that time.
1960 * otherwise, if we search all the inventories and still don't find 1907 * otherwise, if we search all the inventories and still don't find
1961 * a key, return 1908 * a key, return
1962 */ 1909 */
1963 if (!tmp) 1910 if (!tmp)
1964 { 1911 {
1965 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1912 for (tmp = container->inv; tmp; tmp = tmp->below)
1966 { 1913 {
1967 /* No reason to search empty containers */ 1914 /* No reason to search empty containers */
1968 if (tmp->type == CONTAINER && tmp->inv) 1915 if (tmp->type == CONTAINER && tmp->inv)
1969 { 1916 {
1970 if ((key = find_key (pl, tmp, door)) != NULL) 1917 if ((key = find_key (pl, tmp, door)))
1971 return key; 1918 return key;
1972 } 1919 }
1973 } 1920 }
1921
1974 if (!tmp) 1922 if (!tmp)
1975 return NULL; 1923 return NULL;
1976 } 1924 }
1925
1977 /* We get down here if we have found a key. Now if its in a container, 1926 /* We get down here if we have found a key. Now if its in a container,
1978 * see if we actually want to use it 1927 * see if we actually want to use it
1979 */ 1928 */
1980 if (pl != container) 1929 if (pl != container)
1981 { 1930 {
… …
2002 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1951 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
2003 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1952 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
2004 return NULL; 1953 return NULL;
2005 } 1954 }
2006 } 1955 }
1956
2007 return tmp; 1957 return tmp;
2008} 1958}
2009 1959
2010/* moved door processing out of move_player_attack. 1960/* moved door processing out of move_player_attack.
2011 * returns 1 if player has opened the door with a key 1961 * returns 1 if player has opened the door with a key
… …
2025 if (key) 1975 if (key)
2026 { 1976 {
2027 object *container = key->env; 1977 object *container = key->env;
2028 1978
2029 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); 1979 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1980
2030 if (action_makes_visible (op)) 1981 if (action_makes_visible (op))
2031 make_visible (op); 1982 make_visible (op);
1983
2032 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1984 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2033 spring_trap (door->inv, op); 1985 spring_trap (door->inv, op);
1986
2034 if (door->type == DOOR) 1987 if (door->type == DOOR)
2035 {
2036 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1988 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2037 }
2038 else if (door->type == LOCKED_DOOR) 1989 else if (door->type == LOCKED_DOOR)
2039 { 1990 {
2040 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1991 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
2041 remove_door2 (door); /* remove door without violence ;-) */ 1992 remove_door2 (door); /* remove door without violence ;-) */
2042 } 1993 }
1994
2043 /* Do this after we print the message */ 1995 /* Do this after we print the message */
2044 decrease_ob (key); /* Use up one of the keys */ 1996 decrease_ob (key); /* Use up one of the keys */
2045 /* Need to update the weight the container the key was in */ 1997 /* Need to update the weight the container the key was in */
2046 if (container != op) 1998 if (container != op)
2047 esrv_update_item (UPD_WEIGHT, op, container); 1999 esrv_update_item (UPD_WEIGHT, op, container);
2000
2048 return 1; /* Nothing more to do below */ 2001 return 1; /* Nothing more to do below */
2049 } 2002 }
2050 else if (door->type == LOCKED_DOOR) 2003 else if (door->type == LOCKED_DOOR)
2051 { 2004 {
2052 /* Might as well return now - no other way to open this */ 2005 /* Might as well return now - no other way to open this */
2053 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 2006 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2054 return 1; 2007 return 1;
2055 } 2008 }
2009
2056 return 0; 2010 return 0;
2057} 2011}
2058 2012
2059/* This function is just part of a breakup from move_player. 2013/* This function is just part of a breakup from move_player.
2060 * It should keep the code cleaner. 2014 * It should keep the code cleaner.
… …
2064 */ 2018 */
2065void 2019void
2066move_player_attack (object *op, int dir) 2020move_player_attack (object *op, int dir)
2067{ 2021{
2068 object *tmp, *mon; 2022 object *tmp, *mon;
2069 sint16 nx, ny;
2070 int on_battleground; 2023 int on_battleground;
2071 maptile *m; 2024 maptile *m;
2072 2025
2073 nx = freearr_x[dir] + op->x; 2026 sint16 nx = freearr_x[dir] + op->x;
2074 ny = freearr_y[dir] + op->y; 2027 sint16 ny = freearr_y[dir] + op->y;
2075 2028
2076 on_battleground = op_on_battleground (op, 0, 0); 2029 on_battleground = op_on_battleground (op, 0, 0);
2077 2030
2078 /* If braced, or can't move to the square, and it is not out of the 2031 /* If braced, or can't move to the square, and it is not out of the
2079 * map, attack it. Note order of if statement is important - don't 2032 * map, attack it. Note order of if statement is important - don't
… …
2086 */ 2039 */
2087 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny)) 2040 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2088 { 2041 {
2089 if (OUT_OF_REAL_MAP (op->map, nx, ny)) 2042 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2090 { 2043 {
2091 m = get_map_from_coord (op->map, &nx, &ny); 2044 m = op->map->xy_find (nx, ny);
2092 if (!m) 2045 if (!m)
2093 return; /* Don't think this should happen */ 2046 return; /* Don't think this should happen */
2094 } 2047 }
2095 else 2048 else
2096 m = op->map; 2049 m = op->map;
2097 2050
2098 if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL) 2051 if (!(tmp = m->at (nx, ny).bot))
2099 {
2100 /* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2101 return; 2052 return;
2102 }
2103 2053
2104 mon = 0; 2054 mon = 0;
2105 /* Go through all the objects, and find ones of interest. Only stop if 2055 /* Go through all the objects, and find ones of interest. Only stop if
2106 * we find a monster - that is something we know we want to attack. 2056 * we find a monster - that is something we know we want to attack.
2107 * if its a door or barrel (can roll) see if there may be monsters 2057 * if its a door or barrel (can roll) see if there may be monsters
… …
2160 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2110 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2161 { 2111 {
2162 /* If we're braced, we don't want to switch places with it */ 2112 /* If we're braced, we don't want to switch places with it */
2163 if (op->contr->braced) 2113 if (op->contr->braced)
2164 return; 2114 return;
2115
2165 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2116 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2166 (void) push_ob (mon, dir, op); 2117 push_ob (mon, dir, op);
2167 if (op->contr->tmp_invis || op->hide) 2118 if (op->contr->tmp_invis || op->hide)
2168 make_visible (op); 2119 make_visible (op);
2120
2169 return; 2121 return;
2170 } 2122 }
2171 2123
2172 /* in certain circumstances, you shouldn't attack friendly 2124 /* in certain circumstances, you shouldn't attack friendly
2173 * creatures. Note that if you are braced, you can't push 2125 * creatures. Note that if you are braced, you can't push
… …
2187 !on_battleground)) 2139 !on_battleground))
2188 { 2140 {
2189 if (!op->contr->braced) 2141 if (!op->contr->braced)
2190 { 2142 {
2191 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2143 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2192 (void) push_ob (mon, dir, op); 2144 push_ob (mon, dir, op);
2193 } 2145 }
2194 else 2146 else
2195 new_draw_info (0, 0, op, "You withhold your attack"); 2147 new_draw_info (0, 0, op, "You withhold your attack");
2196 2148
2197 if (op->contr->tmp_invis || op->hide) 2149 if (op->contr->tmp_invis || op->hide)
… …
2212 * Way it works is like this: First, it must have some hit points 2164 * Way it works is like this: First, it must have some hit points
2213 * and be living. Then, it must be one of the following: 2165 * and be living. Then, it must be one of the following:
2214 * 1) Not a player, 2) A player, but of a different party. Note 2166 * 1) Not a player, 2) A player, but of a different party. Note
2215 * that party_number -1 is no party, so attacks can still happen. 2167 * that party_number -1 is no party, so attacks can still happen.
2216 */ 2168 */
2217
2218 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2169 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2219 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2170 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2220 { 2171 {
2221
2222 /* If the player hasn't hit something this tick, and does
2223 * so, give them speed boost based on weapon speed. Doing
2224 * it here is better than process_players2, which basically
2225 * incurred a 1 tick offset.
2226 */
2227 if (!op->contr->has_hit) 2172 op->contr->has_hit = 1;
2228 {
2229 op->speed_left += op->speed / op->contr->weapon_sp;
2230
2231 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2232 }
2233 2173
2234 skill_attack (mon, op, 0, 0, 0); 2174 skill_attack (mon, op, 0, 0, 0);
2235 2175
2236 /* If attacking another player, that player gets automatic 2176 /* If attacking another player, that player gets automatic
2237 * hitback, and doesn't loose luck either. 2177 * hitback, and doesn't loose luck either.
… …
2256int 2196int
2257move_player (object *op, int dir) 2197move_player (object *op, int dir)
2258{ 2198{
2259 int pick; 2199 int pick;
2260 2200
2261 if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY) 2201 if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2262 return 0; 2202 return 0;
2263 2203
2264 /* Sanity check: make sure dir is valid */ 2204 /* Sanity check: make sure dir is valid */
2265 if ((dir < 0) || (dir >= 9)) 2205 if ((dir < 0) || (dir >= 9))
2266 { 2206 {
2267 LOG (llevError, "move_player: invalid direction %d\n", dir); 2207 LOG (llevError, "move_player: invalid direction %d\n", dir);
2268 return 0; 2208 return 0;
2269 } 2209 }
2270 2210
2271 /* peterm: added following line */ 2211 /* peterm: added following line */
2272 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2212 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2273 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2213 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2274 2214
2275 op->facing = dir; 2215 op->facing = dir;
2276 2216
2277 if (op->hide) 2217 if (op->hide)
2278 do_hidden_move (op); 2218 do_hidden_move (op);
… …
2311 * Returns true if there are more actions we can do. 2251 * Returns true if there are more actions we can do.
2312 */ 2252 */
2313int 2253int
2314handle_newcs_player (object *op) 2254handle_newcs_player (object *op)
2315{ 2255{
2316 if (op->contr->hidden)
2317 {
2318 op->invisible = 1000;
2319 /* the socket code flashes the player visible/invisible
2320 * depending on the value of invisible, so we need to
2321 * alternate it here for it to work correctly.
2322 */
2323 if (pticks & 2)
2324 op->invisible--;
2325 }
2326 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2327 {
2328 op->invisible--;
2329 if (!op->invisible)
2330 {
2331 make_visible (op);
2332 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2333 }
2334 }
2335
2336 if (QUERY_FLAG (op, FLAG_SCARED)) 2256 if (QUERY_FLAG (op, FLAG_SCARED))
2337 { 2257 {
2338 flee_player (op); 2258 flee_player (op);
2259
2339 /* If player is still scared, that is his action for this tick */ 2260 /* If player is still scared, that is his action for this tick */
2340 if (QUERY_FLAG (op, FLAG_SCARED)) 2261 if (op->flag [FLAG_SCARED])
2341 { 2262 {
2342 op->speed_left--; 2263 --op->speed_left;
2343 return 0; 2264 return 0;
2344 } 2265 }
2345 } 2266 }
2346
2347 /* I've been seeing crashes where the golem has been destroyed, but
2348 * the player object still points to the defunct golem. The code that
2349 * destroys the golem looks correct, and it doesn't always happen, so
2350 * put this in a a workaround to clean up the golem pointer.
2351 */
2352 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2353 op->contr->ranges[range_golem] = 0;
2354 2267
2355 /* call this here - we also will call this in do_ericserver, but 2268 /* call this here - we also will call this in do_ericserver, but
2356 * the players time has been increased when doericserver has been 2269 * the players time has been increased when doericserver has been
2357 * called, so we recheck it here. 2270 * called, so we recheck it here.
2358 */ 2271 */
2359 //TODO: better than handling 8 commands, use some more intelligent rate-limiting 2272 if (op->contr->ns->handle_command ())
2360 for (int rep = 8; --rep && op->contr->ns->handle_command (); ) 2273 return 1;
2361 ;
2362 2274
2363 if (op->speed_left < 0) 2275 if (op->speed_left > 0)
2364 return 0; 2276 {
2365
2366 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2277 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2367 { 2278 {
2368 /* All move commands take 1 tick, at least for now */ 2279 /* All move commands take 1 tick, at least for now */
2369 op->speed_left--; 2280 --op->speed_left;
2370 2281
2371 /* Instead of all the stuff below, let move_player take care 2282 /* Instead of all the stuff below, let move_player take care
2372 * of it. Also, some of the skill stuff is only put in 2283 * of it. Also, some of the skill stuff is only put in
2373 * there, as well as the confusion stuff. 2284 * there, as well as the confusion stuff.
2374 */ 2285 */
2375 move_player (op, op->direction); 2286 move_player (op, op->direction);
2376 if (op->speed_left > 0) 2287
2377 return 1; 2288 return op->speed_left > 0;
2378 else 2289 }
2379 return 0;
2380 } 2290 }
2381 2291
2382 return 0; 2292 return 0;
2383} 2293}
2384 2294
… …
2422 * from. 2332 * from.
2423 */ 2333 */
2424void 2334void
2425remove_unpaid_objects (object *op, object *env) 2335remove_unpaid_objects (object *op, object *env)
2426{ 2336{
2427 object *next;
2428
2429 while (op) 2337 while (op)
2430 { 2338 {
2431 next = op->below; /* Make sure we have a good value, in case 2339 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2432 * we remove object 'op' 2340
2433 */
2434 if (QUERY_FLAG (op, FLAG_UNPAID)) 2341 if (QUERY_FLAG (op, FLAG_UNPAID))
2435 { 2342 {
2436 op->remove ();
2437 op->x = env->x;
2438 op->y = env->y;
2439 if (env->type == PLAYER) 2343 if (env->type == PLAYER)
2440 esrv_del_item (env->contr, op->count); 2344 esrv_del_item (env->contr, op->count);
2441 insert_ob_in_map (op, env->map, NULL, 0); 2345
2346 op->insert_at (env);
2442 } 2347 }
2443 else if (op->inv) 2348 else if (op->inv)
2444 remove_unpaid_objects (op->inv, env); 2349 remove_unpaid_objects (op->inv, env);
2445 2350
2446 op = next; 2351 op = next;
… …
2502 int rate_grace = 2000; 2407 int rate_grace = 2000;
2503 const int max_hp = 1; 2408 const int max_hp = 1;
2504 const int max_sp = 1; 2409 const int max_sp = 1;
2505 const int max_grace = 1; 2410 const int max_grace = 1;
2506 2411
2507 if (op->contr->outputs_sync) 2412 if (op->contr->hidden)
2413 {
2414 op->invisible = 1000;
2415 /* the socket code flashes the player visible/invisible
2416 * depending on the value of invisible, so we need to
2417 * alternate it here for it to work correctly.
2418 */
2419 if (pticks & 2)
2420 op->invisible--;
2508 { 2421 }
2509 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2422 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2510 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2423 {
2511 flush_output_element (op, &op->contr->outputs[i]); 2424 if (!op->invisible--)
2425 {
2426 make_visible (op);
2427 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2428 }
2512 } 2429 }
2513 2430
2514 if (op->contr->ns->state == ST_PLAYING) 2431 if (op->contr->ns->state == ST_PLAYING)
2515 { 2432 {
2516 /* these next three if clauses make it possible to SLOW DOWN 2433 /* these next three if clauses make it possible to SLOW DOWN
… …
2538 gen_grace = op->stats.maxgrace; 2455 gen_grace = op->stats.maxgrace;
2539 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2456 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2540 } 2457 }
2541 2458
2542 /* Regenerate Spell Points */ 2459 /* Regenerate Spell Points */
2543 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0) 2460 if (!op->contr->golem && --op->last_sp < 0)
2544 { 2461 {
2545 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); 2462 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2546 if (op->stats.sp < op->stats.maxsp) 2463 if (op->stats.sp < op->stats.maxsp)
2547 { 2464 {
2548 op->stats.sp++; 2465 op->stats.sp++;
… …
2739 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); 2656 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");
2740 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life..."); 2657 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2741 2658
2742 /* restore player */ 2659 /* restore player */
2743 at = archetype::find ("poisoning"); 2660 at = archetype::find ("poisoning");
2744 tmp = present_arch_in_ob (at, op); 2661 if (object *tmp = present_arch_in_ob (at, op))
2745 if (tmp)
2746 { 2662 {
2747 tmp->destroy (); 2663 tmp->destroy ();
2748 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2664 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2749 } 2665 }
2750 2666
2751 at = archetype::find ("confusion"); 2667 at = archetype::find ("confusion");
2752 tmp = present_arch_in_ob (at, op); 2668 if (object *tmp = present_arch_in_ob (at, op))
2753 if (tmp)
2754 { 2669 {
2755 tmp->destroy (); 2670 tmp->destroy ();
2756 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2671 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2757 } 2672 }
2758 2673
… …
2760 op->stats.hp = op->stats.maxhp; 2675 op->stats.hp = op->stats.maxhp;
2761 if (op->stats.food <= 0) 2676 if (op->stats.food <= 0)
2762 op->stats.food = 999; 2677 op->stats.food = 999;
2763 2678
2764 /* create a bodypart-trophy to make the winner happy */ 2679 /* create a bodypart-trophy to make the winner happy */
2765 tmp = arch_to_object (archetype::find ("finger")); 2680 if (object *tmp = arch_to_object (archetype::find ("finger")))
2766 if (tmp != NULL)
2767 { 2681 {
2768 sprintf (buf, "%s's finger", &op->name); 2682 sprintf (buf, "%s's finger", &op->name);
2769 tmp->name = buf; 2683 tmp->name = buf;
2770 sprintf (buf, " This finger has been cut off %s\n" 2684 sprintf (buf, " This finger has been cut off %s\n"
2771 " the %s, when he was defeated at\n level %d by %s.\n", 2685 " the %s, when he was defeated at\n level %d by %s.\n",
2772 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2686 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2773 tmp->msg = buf; 2687 tmp->msg = buf;
2774 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2688 tmp->value = 0, tmp->type = 0;
2775 tmp->materialname = NULL; 2689 tmp->materialname = "organics";
2776 tmp->x = op->x, tmp->y = op->y; 2690 tmp->insert_at (op, tmp);
2777 insert_ob_in_map (tmp, op->map, op, 0);
2778 } 2691 }
2779 2692
2780 /* teleport defeated player to new destination */ 2693 /* teleport defeated player to new destination */
2781 transfer_ob (op, x, y, 0, NULL); 2694 transfer_ob (op, x, y, 0, NULL);
2782 op->contr->braced = 0; 2695 op->contr->braced = 0;
… …
2787 2700
2788 command_kill_pets (op, 0); 2701 command_kill_pets (op, 0);
2789 2702
2790 if (op->stats.food < 0) 2703 if (op->stats.food < 0)
2791 { 2704 {
2792 if (op->contr->explore)
2793 {
2794 new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2795 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2796 op->stats.food = 999;
2797 return;
2798 }
2799 sprintf (buf, "%s starved to death.", &op->name); 2705 sprintf (buf, "%s starved to death.", &op->name);
2800 strcpy (op->contr->killer, "starvation"); 2706 strcpy (op->contr->killer, "starvation");
2801 } 2707 }
2802 else 2708 else
2803 {
2804 if (op->contr->explore)
2805 {
2806 new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2807 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2808 op->stats.hp = op->stats.maxhp;
2809 return;
2810 }
2811 sprintf (buf, "%s died.", &op->name); 2709 sprintf (buf, "%s died.", &op->name);
2812 } 2710
2813 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2711 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2814 2712
2815 /* save the map location for corpse, gravestone */ 2713 /* save the map location for corpse, gravestone */
2816 x = op->x; 2714 x = op->x;
2817 y = op->y; 2715 y = op->y;
2818 map = op->map; 2716 map = op->map;
2819
2820 2717
2821 /* NOT_PERMADEATH code. This basically brings the character back to 2718 /* NOT_PERMADEATH code. This basically brings the character back to
2822 * life if they are dead - it takes some exp and a random stat. 2719 * life if they are dead - it takes some exp and a random stat.
2823 * See the config.h file for a little more in depth detail about this. 2720 * See the config.h file for a little more in depth detail about this.
2824 */ 2721 */
… …
2841 num_stats_lose = 1; 2738 num_stats_lose = 1;
2842 else 2739 else
2843 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO; 2740 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
2844 } 2741 }
2845 else 2742 else
2846 {
2847 num_stats_lose = 1; 2743 num_stats_lose = 1;
2848 } 2744
2849 lost_a_stat = 0; 2745 lost_a_stat = 0;
2850 2746
2851 for (z = 0; z < num_stats_lose; z++) 2747 for (z = 0; z < num_stats_lose; z++)
2852 { 2748 {
2853 i = RANDOM () % NUM_STATS; 2749 i = RANDOM () % NUM_STATS;
… …
2994 op->stats.hp = op->stats.maxhp; 2890 op->stats.hp = op->stats.maxhp;
2995 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2891 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2996 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2892 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2997 2893
2998 /* 2894 /*
2999 * Check to see if the player is in a shop. IF so, then check to see if
3000 * the player has any unpaid items. If so, remove them and put them back 2895 * Check to see if the player has any unpaid items. If so, remove them
3001 * in the map. 2896 * and put them back in the map.
3002 */ 2897 */
3003
3004 if (is_in_shop (op))
3005 remove_unpaid_objects (op->inv, op); 2898 remove_unpaid_objects (op->inv, op);
3006 2899
3007 /****************************************/ 2900 /****************************************/
3008 /* */ 2901 /* */
3009 /* Move player to his current respawn- */ 2902 /* Move player to his current respawn- */
3010 /* position (usually last savebed) */ 2903 /* position (usually last savebed) */
3011 /* */ 2904 /* */
3012 /****************************************/ 2905 /****************************************/
3013 2906
3014 enter_player_savebed (op); 2907 enter_player_savebed (op);
3015 2908
3016 /* Save the player before inserting the force to reduce
3017 * chance of abuse.
3018 */
3019 op->contr->braced = 0; 2909 op->contr->braced = 0;
3020 op->contr->save ();
3021 2910
3022 /* it is possible that the player has blown something up 2911 /* it is possible that the player has blown something up
3023 * at his savebed location, and that can have long lasting 2912 * at his savebed location, and that can have long lasting
3024 * spell effects. So first see if there is a spell effect 2913 * spell effects. So first see if there is a spell effect
3025 * on the space that might harm the player. 2914 * on the space that might harm the player.
… …
3054void 2943void
3055loot_object (object *op) 2944loot_object (object *op)
3056{ /* Grab and destroy some treasure */ 2945{ /* Grab and destroy some treasure */
3057 object *tmp, *tmp2, *next; 2946 object *tmp, *tmp2, *next;
3058 2947
3059 if (op->container) 2948 op->close_container (); /* close open sack first */
3060 esrv_apply_container (op, op->container); /* close open sack first */
3061 2949
3062 for (tmp = op->inv; tmp; tmp = next) 2950 for (tmp = op->inv; tmp; tmp = next)
3063 { 2951 {
3064 next = tmp->below; 2952 next = tmp->below;
3065 2953
3066 if (tmp->invisible) 2954 if (tmp->invisible)
3067 continue; 2955 continue;
3068 2956
3069 tmp->remove (); 2957 tmp->remove ();
3070 tmp->x = op->x, tmp->y = op->y; 2958 tmp->x = op->x, tmp->y = op->y;
2959
3071 if (tmp->type == CONTAINER) 2960 if (tmp->type == CONTAINER)
3072 { /* empty container to ground */ 2961 loot_object (tmp); /* empty container to ground */
3073 loot_object (tmp); 2962
3074 }
3075 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2963 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3076 { 2964 {
3077 if (tmp->nrof > 1) 2965 if (tmp->nrof > 1)
3078 { 2966 {
3079 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2967 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3080 tmp2->destroy (); 2968 tmp2->destroy ();
… …
3091/* 2979/*
3092 * fix_weight(): Check recursively the weight of all players, and fix 2980 * fix_weight(): Check recursively the weight of all players, and fix
3093 * what needs to be fixed. Refresh windows and fix speed if anything 2981 * what needs to be fixed. Refresh windows and fix speed if anything
3094 * was changed. 2982 * was changed.
3095 */ 2983 */
3096
3097void 2984void
3098fix_weight (void) 2985fix_weight (void)
3099{ 2986{
3100 for (player *pl = first_player; pl; pl = pl->next) 2987 for_all_players (pl)
3101 { 2988 {
3102 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2989 int old = pl->ob->carrying, sum = sum_weight (pl->ob);
3103 2990
3104 if (old == sum) 2991 if (old == sum)
3105 continue; 2992 continue;
… …
3109} 2996}
3110 2997
3111void 2998void
3112fix_luck (void) 2999fix_luck (void)
3113{ 3000{
3114 for (player *pl = first_player; pl; pl = pl->next) 3001 for_all_players (pl)
3115 if (!pl->ob->contr->ns->state) 3002 if (!pl->ob->contr->ns->state)
3116 pl->ob->change_luck (0); 3003 pl->ob->change_luck (0);
3117} 3004}
3118 3005
3119/* cast_dust() - handles op throwing objects of type 'DUST'. 3006/* cast_dust() - handles op throwing objects of type 'DUST'.
… …
3161 if (op->type == PLAYER) 3048 if (op->type == PLAYER)
3162 { 3049 {
3163 op->contr->tmp_invis = 0; 3050 op->contr->tmp_invis = 0;
3164 op->contr->invis_race = 0; 3051 op->contr->invis_race = 0;
3165 } 3052 }
3053
3166 update_object (op, UP_OBJ_FACE); 3054 update_object (op, UP_OBJ_CHANGE);
3167} 3055}
3168 3056
3169int 3057int
3170is_true_undead (object *op) 3058is_true_undead (object *op)
3171{ 3059{
3172 object *tmp = NULL;
3173
3174 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3060 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3175 return 1; 3061 return 1;
3176 3062
3177 return 0; 3063 return 0;
3178} 3064}
… …
3237 3123
3238 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3124 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3239 3125
3240 /* its *extremely* hard to run and sneak/hide at the same time! */ 3126 /* its *extremely* hard to run and sneak/hide at the same time! */
3241 if (op->type == PLAYER && op->contr->run_on) 3127 if (op->type == PLAYER && op->contr->run_on)
3242 {
3243 if (!skop || num >= skop->level) 3128 if (!skop || num >= skop->level)
3244 { 3129 {
3245 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!"); 3130 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3246 make_visible (op); 3131 make_visible (op);
3247 return; 3132 return;
3248 } 3133 }
3249 else 3134 else
3250 num += 20; 3135 num += 20;
3251 } 3136
3252 num += op->map->difficulty; 3137 num += op->map->difficulty;
3253 hide = hideability (op); /* modify by terrain hidden level */ 3138 hide = hideability (op); /* modify by terrain hidden level */
3254 num -= hide; 3139 num -= hide;
3140
3255 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3141 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3256 { 3142 {
3257 make_visible (op); 3143 make_visible (op);
3258 if (op->type == PLAYER) 3144 if (op->type == PLAYER)
3259 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3145 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3260 } 3146 }
3261 else if (op->type == PLAYER && skop) 3147 else if (op->type == PLAYER && skop)
3262 {
3263 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3148 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3264 }
3265} 3149}
3266 3150
3267/* determine if who is standing near a hostile creature. */ 3151/* determine if who is standing near a hostile creature. */
3268 3152
3269int 3153int
… …
3336 if (pl->type != PLAYER) 3220 if (pl->type != PLAYER)
3337 { 3221 {
3338 LOG (llevError, "player_can_view() called for non-player object\n"); 3222 LOG (llevError, "player_can_view() called for non-player object\n");
3339 return -1; 3223 return -1;
3340 } 3224 }
3225
3341 if (!pl || !op) 3226 if (!pl || !op)
3342 return 0; 3227 return 0;
3343 3228
3344 if (op->head)
3345 {
3346 op = op->head; 3229 op = op->head_ ();
3347 } 3230
3348 get_rangevector (pl, op, &rv, 0x1); 3231 get_rangevector (pl, op, &rv, 0x1);
3349 3232
3350 /* starting with the 'head' part, lets loop 3233 /* starting with the 'head' part, lets loop
3351 * through the object and find if it has any 3234 * through the object and find if it has any
3352 * part that is in the los array but isnt on 3235 * part that is in the los array but isnt on
… …
3469 char buf[MAX_BUF]; /* tmp. string buffer */ 3352 char buf[MAX_BUF]; /* tmp. string buffer */
3470 int i = 0, j = 0; 3353 int i = 0, j = 0;
3471 3354
3472 /* get the appropriate treasurelist */ 3355 /* get the appropriate treasurelist */
3473 if (atnr == ATNR_FIRE) 3356 if (atnr == ATNR_FIRE)
3474 trlist = find_treasurelist ("dragon_ability_fire"); 3357 trlist = treasurelist::find ("dragon_ability_fire");
3475 else if (atnr == ATNR_COLD) 3358 else if (atnr == ATNR_COLD)
3476 trlist = find_treasurelist ("dragon_ability_cold"); 3359 trlist = treasurelist::find ("dragon_ability_cold");
3477 else if (atnr == ATNR_ELECTRICITY) 3360 else if (atnr == ATNR_ELECTRICITY)
3478 trlist = find_treasurelist ("dragon_ability_elec"); 3361 trlist = treasurelist::find ("dragon_ability_elec");
3479 else if (atnr == ATNR_POISON) 3362 else if (atnr == ATNR_POISON)
3480 trlist = find_treasurelist ("dragon_ability_poison"); 3363 trlist = treasurelist::find ("dragon_ability_poison");
3481 3364
3482 if (trlist == NULL || who->type != PLAYER) 3365 if (trlist == NULL || who->type != PLAYER)
3483 return; 3366 return;
3484 3367
3485 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3368 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3486 3369
3487 if (tr == NULL || tr->item == NULL) 3370 if (!tr || !tr->item)
3488 { 3371 {
3489 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3372 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3490 return; 3373 return;
3491 } 3374 }
3492 3375
… …
3617 * not readied. 3500 * not readied.
3618 */ 3501 */
3619void 3502void
3620player_unready_range_ob (player *pl, object *ob) 3503player_unready_range_ob (player *pl, object *ob)
3621{ 3504{
3622 rangetype i; 3505 if (pl->ob->current_weapon == ob)
3506 pl->ob->current_weapon = 0;
3623 3507
3624 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3508 if (pl->combat_ob == ob)
3625 { 3509 pl->combat_ob = 0;
3510
3626 if (pl->ranges[i] == ob) 3511 if (pl->ranged_ob == ob)
3627 { 3512 pl->ranged_ob = 0;
3628 pl->ranges[i] = NULL;
3629 if (pl->shoottype == i)
3630 {
3631 pl->shoottype = range_none;
3632 }
3633 }
3634 }
3635} 3513}
3514
3515sint8
3516player::visibility_at (maptile *map, int x, int y) const
3517{
3518 if (!ns)
3519 return 0;
3520
3521 int dx, dy;
3522 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3523 return 0;
3524
3525 x += dx - ns->current_x + ns->mapx / 2;
3526 y += dy - ns->current_y + ns->mapy / 2;
3527
3528 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3529 return 0;
3530
3531 return 100 - blocked_los [x][y];
3532}

Diff Legend

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